Jjie
/
DeYiShiBase
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

1

master
姜鹏 2 weeks ago
parent
9bbfe6018f
commit
3760824e20
1 changed files with 24 additions and 1 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 25
      ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSSubmitService.cs

25
ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSSubmitService.cs
View File

@ -104,6 +104,7 @@ namespace ICSSoft.DataProject
inv.InvName, inv.InvName,
inv.InvStd, inv.InvStd,
inv.EATTRIBUTE4 AS module, inv.EATTRIBUTE4 AS module,
inv.EATTRIBUTE5 AS ZJNO,
a.Quantity, a.Quantity,
inv.InvUnit, inv.InvUnit,
a.Amount, a.Amount,
@ -149,6 +150,7 @@ namespace ICSSoft.DataProject
inv.InvName, inv.InvName,
inv.InvStd, inv.InvStd,
inv.EATTRIBUTE4 AS module, inv.EATTRIBUTE4 AS module,
inv.EATTRIBUTE5 AS ZJNO,
a.Quantity, a.Quantity,
inv.InvUnit, inv.InvUnit,
a.Amount, a.Amount,
@ -195,6 +197,7 @@ namespace ICSSoft.DataProject
inv.InvName, inv.InvName,
inv.InvStd, inv.InvStd,
inv.EATTRIBUTE4 AS module, inv.EATTRIBUTE4 AS module,
inv.EATTRIBUTE5 AS ZJNO,
inv.EATTRIBUTE5 AS memoryCode, inv.EATTRIBUTE5 AS memoryCode,
a.Quantity, a.Quantity,
inv.InvUnit, inv.InvUnit,
@ -7553,6 +7556,7 @@ ISNULL(c.MTIME,'') AS MTIME,'' AS VenCode,'' AS cVenName,d.InvUnit,'' AS POCode,
inv.LotEnable, inv.LotEnable,
{0} {0}
inv.AmountUnit, inv.AmountUnit,
inv.EATTRIBUTE5 AS ZJNO,
ext.ID AS ExtensionID, ext.ID AS ExtensionID,
ext.ProjectCode, ext.ProjectCode,
ext.Version, ext.Version,
@ -7751,6 +7755,7 @@ ISNULL(c.MTIME,'') AS MTIME,'' AS VenCode,'' AS cVenName,d.InvUnit,'' AS POCode,
inv.InvUnit, inv.InvUnit,
{0} {0}
inv.AmountUnit, inv.AmountUnit,
inv.EATTRIBUTE5 AS ZJNO,
ext.ID AS ExtensionID, ext.ID AS ExtensionID,
ext.ProjectCode, ext.ProjectCode,
ext.Version, ext.Version,
@ -24712,6 +24717,12 @@ BEGIN
RETURN RETURN
END END
IF EXISTS(SELECT 1 FROM ICSWareHouseLotInfo WHERE LotNo='{0}' AND WorkPoint='{1}')
BEGIN
RAISERROR('条码 {0} 已入库',16,1)
RETURN
END
SELECT SELECT
a.LotNo,inv.InvCode,inv.InvName,inv.InvStd,c.Amount,b.TransCode,b.TransSequence,b.TransQty AS Quantity,c.WHCode,inv.EATTRIBUTE5 AS ZJNO a.LotNo,inv.InvCode,inv.InvName,inv.InvStd,c.Amount,b.TransCode,b.TransSequence,b.TransQty AS Quantity,c.WHCode,inv.EATTRIBUTE5 AS ZJNO
FROM ICSInventoryLot a FROM ICSInventoryLot a
@ -30873,7 +30884,7 @@ SELECT DISTINCT WorkPoint FROM ICSMO WHERE MOCode='{0}'", item.MOCode);
CASE WHEN isnull(c.Quantity,'')=0 THEN a.Quantity ELSE isnull(c.Quantity,'') END as Quantity, CASE WHEN isnull(c.Quantity,'')=0 THEN a.Quantity ELSE isnull(c.Quantity,'') END as Quantity,
isnull(c.LotNo,'') as OLDLotNo, isnull(c.LotNo,'') as OLDLotNo,
isnull(b.InvUnit,'') as InvUnit, isnull(b.InvUnit,'') as InvUnit,
isnull(b.InvCode,'') as InvCode,
isnull(b.EATTRIBUTE5,'') as InvCode,
isnull(b.InvName,'') as InvName, isnull(b.InvName,'') as InvName,
isnull(v.VenName,'') as VenName, isnull(v.VenName,'') as VenName,
isnull(a.EATTRIBUTE9,'') as MPN, isnull(a.EATTRIBUTE9,'') as MPN,
@ -30994,6 +31005,7 @@ END as NEWLotNo
inv.InvName, inv.InvName,
inv.InvStd, inv.InvStd,
inv.EATTRIBUTE4 AS module, inv.EATTRIBUTE4 AS module,
inv.EATTRIBUTE5 AS ZJNO,
a.Quantity, a.Quantity,
inv.InvUnit, inv.InvUnit,
a.Amount, a.Amount,
@ -31595,6 +31607,17 @@ END as NEWLotNo
foreach (var item in JsonData) foreach (var item in JsonData)
{ {
//检验该条码是否到货
string chkDNSql = string.Format(@"IF EXISTS(SELECT
1
FROM ICSInventoryLot a
INNER JOIN ICSInventoryLotDetailKG b ON b.LotNo=a.LotNo AND b.WorkPoint=a.WorkPoint
WHERE a.LotNo='{0}' AND a.WorkPoint='{1}')
BEGIN
RAISERROR('" + language.GetNameByCode("WMSAPIInfo537") + @"',16,1)
RETURN
END", item.LotNo, item.WorkPoint);
DBHelper.ExecuteNonQuery(chkDNSql, cmd);
//检验自由项 //检验自由项
Colspan = item.ProjectCode + "~" + item.BatchCode + "~" + item.Version Colspan = item.ProjectCode + "~" + item.BatchCode + "~" + item.Version

Write Preview
Loading…
Cancel
Save