Luy
/
NWeiWMS
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

调整调拨入库接口

master
lilili 2 years ago
parent
46c2c7224e
commit
0b467b7c35
4 changed files with 83 additions and 34 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSManufactureService.cs
  2. 46
      ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSSubmitService.cs
  3. 58
      ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSWareHouseLotInfoService.cs
  4. 3
      ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSWareHouseService.cs

10
ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSManufactureService.cs
View File

@ -305,11 +305,11 @@ namespace ICSSoft.DataProject
RAISERROR('" + language.GetNameByCode("WMSAPIInfo131") + @"',16,1);
RETURN
END
ELSE IF (@Status!='1')
BEGIN
RAISERROR('" + language.GetNameByCode("WMSAPIInfo132") + @"',16,1);
RETURN
END
--ELSE IF (@Status!='1')
--BEGIN
--RAISERROR('" + language.GetNameByCode("WMSAPIInfo132") + @"',16,1);
--RETURN
--END
UPDATE a SET IssueQuantity=ISNULL(IssueQuantity,0)+'{2}'
FROM ICSMOIssue a
WHERE a.IssueCode='{0}' AND a.Sequence='{3}' AND a.WorkPoint='{1}'

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

@ -4859,8 +4859,11 @@ namespace ICSSoft.DataProject
itemInfo.LotNo, itemInfo.CurrentQuantity, item.User, item.WorkPoint, "14", TransTypeEnum.StepTransferApplicationIn.GetDescription<DBValue>(), cmd, language, MergeID);
}
}
ICSWareHouseService.OneStepTransferDocInERP(TransTypeEnum.OneStepTransferDocIn.GetDescription(), Identification, cmd, language, BusinessCode);
//上传ERP
if (Convert.ToBoolean(System.Configuration.ConfigurationManager.AppSettings["UploadERP"]))
{
ICSWareHouseService.OneStepTransferDocInERP(TransTypeEnum.OneStepTransferDocIn.GetDescription(), Identification, cmd, language, BusinessCode);
}
if (!printTable.Equals("{}"))
{
cmd.Transaction.Commit();
@ -4936,21 +4939,21 @@ namespace ICSSoft.DataProject
item.TransCode = trans[1];
}
//验证信息
sql = @"DECLARE @Status VARCHAR(10)
SELECT @Status=Status FROM ICSTransfer WHERE TransferNO='{0}' and WorkPoint='{1}' AND Type = '1'
IF (@Status IS NULL)
BEGIN
RAISERROR('" + language.GetNameByCode("WMSAPIInfo067") + @"',16,1);
RETURN
END
ELSE IF (@Status!='1')
BEGIN
RAISERROR('" + language.GetNameByCode("WMSAPIInfo068") + @"',16,1);
RETURN
END";
sql = string.Format(sql, item.TransCode, item.WorkPoint);
DBHelper.ExecuteNonQuery(sql, cmd);
//sql = @"DECLARE @Status VARCHAR(10)
// SELECT @Status=Status FROM ICSTransfer WHERE TransferNO='{0}' and WorkPoint='{1}' AND Type = '1'
// IF (@Status IS NULL)
// BEGIN
// RAISERROR('" + language.GetNameByCode("WMSAPIInfo067") + @"',16,1);
// RETURN
// END
// ELSE IF (@Status!='1')
// BEGIN
// RAISERROR('" + language.GetNameByCode("WMSAPIInfo068") + @"',16,1);
// RETURN
// END";
//sql = string.Format(sql, item.TransCode, item.WorkPoint);
//DBHelper.ExecuteNonQuery(sql, cmd);
foreach (var itemInfo in item.Detail)
{
@ -4982,11 +4985,14 @@ namespace ICSSoft.DataProject
//更新条码信息
printTable = ICSWareHouseLotInfoService.WareHouseLotInfoTransfer(Identification, item.TransCode, item.TransSequence, itemInfo.WarehouseCode, itemInfo.LocationCode,
itemInfo.LotNo, itemInfo.CurrentQuantity, item.User, item.WorkPoint, "6", TransTypeEnum.OneStepTransferDocIn.GetDescription<DBValue>(), cmd, language, MergeID);
itemInfo.LotNo, itemInfo.CurrentQuantity, item.User, item.WorkPoint, item.TransType, TransTypeEnum.OneStepTransferDocIn.GetDescription<DBValue>(), cmd, language, MergeID);
}
}
ICSWareHouseService.OneStepTransferDocInERP(TransTypeEnum.OneStepTransferDocIn.GetDescription(), Identification, cmd, language, BusinessCode);
//上传ERP
if (Convert.ToBoolean(System.Configuration.ConfigurationManager.AppSettings["UploadERP"]))
{
ICSWareHouseService.OneStepTransferDocInERP(TransTypeEnum.OneStepTransferDocIn.GetDescription(), Identification, cmd, language, BusinessCode);
}
if (!printTable.Equals("{}"))
{
cmd.Transaction.Commit();

58
ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSWareHouseLotInfoService.cs
View File

@ -960,6 +960,7 @@ namespace ICSSoft.DataProject
RAISERROR('" + language.GetNameByCode("WMSAPIInfo167") + @"',16,1);
RETURN
END";
sql = string.Format(sql, LotNo, WorkPoint, Quantity);
if (!DBHelper.ExecuteNonQuery(sql, cmd))
@ -1159,14 +1160,55 @@ namespace ICSSoft.DataProject
}
///更新库存
sql = @"UPDATE ICSWareHouseLotInfo SET WareHouseCode='{2}',LocationCode='{3}' WHERE LotNo='{0}' AND WorkPoint='{1}'
IF EXISTS(SELECT a.LotNo FROM ICSWareHouseLotInfo a WHERE a.LotNo='{0}' AND a.WorkPoint='{1}' AND Quantity<0)
BEGIN
RAISERROR('" + language.GetNameByCode("WMSAPIInfo167") + @"',16,1);
RETURN
END";
sql = string.Format(sql, LotNo, WorkPoint, WarehouseCode, LocationCode);
//sql = @"UPDATE ICSWareHouseLotInfo SET WareHouseCode='{2}',LocationCode='{3}' WHERE LotNo='{0}' AND WorkPoint='{1}'
// IF EXISTS(SELECT a.LotNo FROM ICSWareHouseLotInfo a WHERE a.LotNo='{0}' AND a.WorkPoint='{1}' AND Quantity<0)
// BEGIN
// RAISERROR('" + language.GetNameByCode("WMSAPIInfo167") + @"',16,1);
// RETURN
// END";
sql = $@"DECLARE @EATTRIBUTE INT;
SELECT
@EATTRIBUTE = a.EATTRIBUTE1
FROM
ICSTransfer a
WHERE
TransferNO = '{TransCode}'
AND Sequence = '{TransSequence}'
AND WorkPoint = '{WorkPoint}'
AND Type = '{TransType}';
IF
@EATTRIBUTE IS NULL BEGIN
UPDATE ICSWareHouseLotInfo
SET WareHouseCode = '{WarehouseCode}',
LocationCode = '{LocationCode}'
WHERE
LotNo = '{LotNo}'
AND WorkPoint = '{WorkPoint}';
END
ELSE IF @EATTRIBUTE=''
BEGIN
UPDATE ICSWareHouseLotInfo
SET WareHouseCode = '{WarehouseCode}',
LocationCode = '{LocationCode}'
WHERE
LotNo = '{LotNo}'
AND WorkPoint = '{WorkPoint}';
END
ELSE BEGIN
UPDATE ICSWareHouseLotInfo
SET WareHouseCode = '{WarehouseCode}',
LocationCode = '{LocationCode}',
WorkPoint =@EATTRIBUTE
WHERE
LotNo = '{LotNo}'
AND WorkPoint = '{WorkPoint}';
END
IF EXISTS ( SELECT a.LotNo FROM ICSWareHouseLotInfo a WHERE a.LotNo= '{LotNo}' AND a.WorkPoint= '{WorkPoint}' AND Quantity < 0 ) BEGIN
RAISERROR ( '{language.GetNameByCode("WMSAPIInfo167")}', 16, 1 );
RETURN END;";
sql = string.Format(sql, LotNo, WorkPoint, WarehouseCode, LocationCode, TransCode,TransSequence,TransType);
if (!DBHelper.ExecuteNonQuery(sql, cmd))
{

3
ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSWareHouseService.cs
View File

@ -38,7 +38,8 @@ namespace ICSSoft.DataProject
WHERE TransferNO='{0}' AND Sequence='{3}' AND WorkPoint='{1}' AND Type='1'
IF EXISTS(SELECT a.ID FROM ICSTransfer a
WHERE a.TransferNO='{0}' AND a.Sequence='{3}' and a.WorkPoint='{1}' AND a.Type='1' AND a.TransferQuantity<a.TransferQuantity)
WHERE a.TransferNO='{0}' AND a.Sequence='{3}' and a.WorkPoint='{1}' AND a.Type='1'
AND a.Quantity<a.TransferQuantity)
BEGIN
RAISERROR('" + language.GetNameByCode("WMSAPIInfo144") + @"',16,1);
RETURN

Write Preview
Loading…
Cancel
Save