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

退料类型区分

master
lixh 3 years ago
parent
25c7279000
commit
9600784768
2 changed files with 222 additions and 151 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. 1
      ICSSoft.WMS.WebAPI/ICSSoft.Common/HTTPHelper.cs
  2. 372
      ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSSubmitService.cs

1
ICSSoft.WMS.WebAPI/ICSSoft.Common/HTTPHelper.cs
View File

@ -14,6 +14,7 @@ namespace ICSSoft.Common
{ {
try try
{ {
//log.Debug(url + Environment.NewLine + body);
Encoding encoding = Encoding.UTF8; Encoding encoding = Encoding.UTF8;
System.Net.HttpWebRequest request = (System.Net.HttpWebRequest)System.Net.WebRequest.Create(url); System.Net.HttpWebRequest request = (System.Net.HttpWebRequest)System.Net.WebRequest.Create(url);
request.Method = "POST"; request.Method = "POST";

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

@ -959,9 +959,9 @@ namespace ICSSoft.DataProject
//1 - 不管控 //1 - 不管控
//2 - 提醒 //2 - 提醒
//3 - 限制 //3 - 限制
if(resultEffective == "2")
if (resultEffective == "2")
{ {
msg += string.Format(language.GetNameByCode("WMSAPIInfo181"), Lot)+Environment.NewLine;
msg += string.Format(language.GetNameByCode("WMSAPIInfo181"), Lot) + Environment.NewLine;
} }
else if (resultEffective == "3") else if (resultEffective == "3")
{ {
@ -974,9 +974,9 @@ namespace ICSSoft.DataProject
//1 - 不管控 //1 - 不管控
//2 - 提醒 //2 - 提醒
//3 - 限制 //3 - 限制
if(result=="2")
if (result == "2")
{ {
msg += string.Format(language.GetNameByCode("WMSAPIInfo178"), Lot)+Environment.NewLine;
msg += string.Format(language.GetNameByCode("WMSAPIInfo178"), Lot) + Environment.NewLine;
} }
else if (result == "3") else if (result == "3")
{ {
@ -990,7 +990,7 @@ namespace ICSSoft.DataProject
Result res = new Result(); Result res = new Result();
res.Success = true; res.Success = true;
res.Message = msg;// "接口调用成功！"; res.Message = msg;// "接口调用成功！";
if(!isLimit)
if (!isLimit)
res.Data = table; res.Data = table;
return res; return res;
//出库时 //出库时
@ -1119,7 +1119,7 @@ namespace ICSSoft.DataProject
|| TransType == TransTypeEnum.ICSOutsourcingIssueDoNegativeIssue.GetDescription()) || TransType == TransTypeEnum.ICSOutsourcingIssueDoNegativeIssue.GetDescription())
{ {
//更新源头单据数量 //更新源头单据数量
ICSOutsourcingService.OutsourcingIssueDoNegative(itemInfo.LotNo, itemInfo.Quantity, item.WorkPoint, cmd,language);
ICSOutsourcingService.OutsourcingIssueDoNegative(itemInfo.LotNo, itemInfo.Quantity, item.WorkPoint, cmd, language);
BusinessCode = TransTypeEnum.ICSOutsourcingIssueDoNegative.GetDescription<DBValue>(); BusinessCode = TransTypeEnum.ICSOutsourcingIssueDoNegative.GetDescription<DBValue>();
} }
#endregion #endregion
@ -1127,7 +1127,7 @@ namespace ICSSoft.DataProject
else if (TransType == TransTypeEnum.OutsourcingReceiveDoc.GetDescription()) else if (TransType == TransTypeEnum.OutsourcingReceiveDoc.GetDescription())
{ {
//更新源头单据数量 //更新源头单据数量
ICSOutsourcingService.OutsourcingReceiveDoc(itemInfo.LotNo, itemInfo.Quantity, item.WorkPoint, cmd,language);
ICSOutsourcingService.OutsourcingReceiveDoc(itemInfo.LotNo, itemInfo.Quantity, item.WorkPoint, cmd, language);
BusinessCode = TransTypeEnum.OutsourcingReceiveDoc.GetDescription<DBValue>(); BusinessCode = TransTypeEnum.OutsourcingReceiveDoc.GetDescription<DBValue>();
} }
#endregion #endregion
@ -1137,7 +1137,7 @@ namespace ICSSoft.DataProject
|| TransType == TransTypeEnum.MOIssueDocNegativeIssue.GetDescription()) || TransType == TransTypeEnum.MOIssueDocNegativeIssue.GetDescription())
{ {
//更新源头单据数量 //更新源头单据数量
ICSManufactureService.MOIssueDocNegative(itemInfo.LotNo, itemInfo.Quantity, item.WorkPoint, cmd,language);
ICSManufactureService.MOIssueDocNegative(itemInfo.LotNo, itemInfo.Quantity, item.WorkPoint, cmd, language);
BusinessCode = TransTypeEnum.MOIssueDocNegative.GetDescription<DBValue>(); BusinessCode = TransTypeEnum.MOIssueDocNegative.GetDescription<DBValue>();
} }
#endregion #endregion
@ -1145,7 +1145,7 @@ namespace ICSSoft.DataProject
else if (TransType == TransTypeEnum.ManufactureReceiveDoc.GetDescription()) else if (TransType == TransTypeEnum.ManufactureReceiveDoc.GetDescription())
{ {
//更新源头单据数量 //更新源头单据数量
ICSManufactureService.ManufactureReceiveDoc(itemInfo.LotNo, itemInfo.Quantity, item.WorkPoint, cmd,language);
ICSManufactureService.ManufactureReceiveDoc(itemInfo.LotNo, itemInfo.Quantity, item.WorkPoint, cmd, language);
BusinessCode = TransTypeEnum.ManufactureReceiveDoc.GetDescription<DBValue>(); BusinessCode = TransTypeEnum.ManufactureReceiveDoc.GetDescription<DBValue>();
} }
#endregion #endregion
@ -1153,7 +1153,7 @@ namespace ICSSoft.DataProject
else if (TransType == TransTypeEnum.ManufactureReceive.GetDescription()) else if (TransType == TransTypeEnum.ManufactureReceive.GetDescription())
{ {
//更新源头单据数量 //更新源头单据数量
ICSManufactureService.ManufactureReceive(itemInfo.LotNo, itemInfo.Quantity, item.WorkPoint, cmd,language);
ICSManufactureService.ManufactureReceive(itemInfo.LotNo, itemInfo.Quantity, item.WorkPoint, cmd, language);
BusinessCode = TransTypeEnum.ManufactureReceive.GetDescription<DBValue>(); BusinessCode = TransTypeEnum.ManufactureReceive.GetDescription<DBValue>();
} }
#endregion #endregion
@ -1161,7 +1161,7 @@ namespace ICSSoft.DataProject
else if (TransType == TransTypeEnum.SalesShipmentDocNegative.GetDescription()) else if (TransType == TransTypeEnum.SalesShipmentDocNegative.GetDescription())
{ {
//更新源头单据数量 //更新源头单据数量
ICSSalesService.SalesShipmentDocNegative(itemInfo.LotNo, itemInfo.Quantity, item.WorkPoint, cmd,language);
ICSSalesService.SalesShipmentDocNegative(itemInfo.LotNo, itemInfo.Quantity, item.WorkPoint, cmd, language);
BusinessCode = TransTypeEnum.SalesShipmentDocNegative.GetDescription<DBValue>(); BusinessCode = TransTypeEnum.SalesShipmentDocNegative.GetDescription<DBValue>();
} }
#endregion #endregion
@ -1169,14 +1169,14 @@ namespace ICSSoft.DataProject
else if (TransType == TransTypeEnum.OtherInDoc.GetDescription()) else if (TransType == TransTypeEnum.OtherInDoc.GetDescription())
{ {
//更新源头单据数量 //更新源头单据数量
ICSWareHouseService.OtherInDoc(itemInfo.LotNo, itemInfo.Quantity, item.WorkPoint, cmd,language);
ICSWareHouseService.OtherInDoc(itemInfo.LotNo, itemInfo.Quantity, item.WorkPoint, cmd, language);
BusinessCode = TransTypeEnum.OtherInDoc.GetDescription<DBValue>(); BusinessCode = TransTypeEnum.OtherInDoc.GetDescription<DBValue>();
} }
#endregion #endregion
#region 拆卸单 #region 拆卸单
else if (TransType == TransTypeEnum.DisassemblyDoc.GetDescription()) else if (TransType == TransTypeEnum.DisassemblyDoc.GetDescription())
{ {
ICSWareHouseService.DisassemblyDoc(itemInfo.LotNo, itemInfo.Quantity, item.WorkPoint, cmd,language);
ICSWareHouseService.DisassemblyDoc(itemInfo.LotNo, itemInfo.Quantity, item.WorkPoint, cmd, language);
WHTransType = "11"; WHTransType = "11";
BusinessCode = TransTypeEnum.DisassemblyDoc.GetDescription<DBValue>(); BusinessCode = TransTypeEnum.DisassemblyDoc.GetDescription<DBValue>();
} }
@ -1185,7 +1185,7 @@ namespace ICSSoft.DataProject
else if (TransType == TransTypeEnum.ReturnDoc.GetDescription()) else if (TransType == TransTypeEnum.ReturnDoc.GetDescription())
{ {
//更新源头单据数量 //更新源头单据数量
ICSWareHouseService.ReturnDoc(itemInfo.LotNo, itemInfo.Quantity, item.WorkPoint, cmd,language);
ICSWareHouseService.ReturnDoc(itemInfo.LotNo, itemInfo.Quantity, item.WorkPoint, cmd, language);
BusinessCode = TransTypeEnum.ReturnDoc.GetDescription<DBValue>(); BusinessCode = TransTypeEnum.ReturnDoc.GetDescription<DBValue>();
} }
#endregion #endregion
@ -1193,7 +1193,7 @@ namespace ICSSoft.DataProject
else if (TransType == TransTypeEnum.SalesReturnBack.GetDescription()) else if (TransType == TransTypeEnum.SalesReturnBack.GetDescription())
{ {
//更新源头单据数量 //更新源头单据数量
ICSSalesService.SalesReturnBackIn(itemInfo.TransCode, itemInfo.TransSequence, itemInfo.LotNo, itemInfo.Quantity, item.WorkPoint, cmd,language);
ICSSalesService.SalesReturnBackIn(itemInfo.TransCode, itemInfo.TransSequence, itemInfo.LotNo, itemInfo.Quantity, item.WorkPoint, cmd, language);
//入库 //入库
BusinessCode = TransTypeEnum.SalesReturnBack.GetDescription<DBValue>(); BusinessCode = TransTypeEnum.SalesReturnBack.GetDescription<DBValue>();
@ -1209,7 +1209,7 @@ namespace ICSSoft.DataProject
if (TransType == TransTypeEnum.DisassemblyDoc.GetDescription()) if (TransType == TransTypeEnum.DisassemblyDoc.GetDescription())
{ {
//更新套件锁定数量 //更新套件锁定数量
ICSWareHouseService.DisassemblyDoc(Identification, cmd,language);
ICSWareHouseService.DisassemblyDoc(Identification, cmd, language);
} }
#endregion} #endregion}
} }
@ -1227,47 +1227,47 @@ namespace ICSSoft.DataProject
ICSPurchaseService.PurchaseRejectDocInERP(TransType, Identification, cmd, language); ICSPurchaseService.PurchaseRejectDocInERP(TransType, Identification, cmd, language);
//审核的委外到货单 //审核的委外到货单
else if (TransType == TransTypeEnum.ODeliveryNotice.GetDescription()) else if (TransType == TransTypeEnum.ODeliveryNotice.GetDescription())
ICSOutsourcingService.ODeliveryNoticeInERP(TransType, Identification, cmd,language);
ICSOutsourcingService.ODeliveryNoticeInERP(TransType, Identification, cmd, language);
//委外拒收 //委外拒收
else if (TransType == TransTypeEnum.OutsourcingRejectDoc.GetDescription()) else if (TransType == TransTypeEnum.OutsourcingRejectDoc.GetDescription())
ICSOutsourcingService.OutsourcingRejectDocInERP(TransType, Identification, cmd,language);
ICSOutsourcingService.OutsourcingRejectDocInERP(TransType, Identification, cmd, language);
//委外退料 //委外退料
else if (TransType == TransTypeEnum.ICSOutsourcingIssueDoNegative.GetDescription() else if (TransType == TransTypeEnum.ICSOutsourcingIssueDoNegative.GetDescription()
|| TransType == TransTypeEnum.ICSOutsourcingIssueDoNegativeApply.GetDescription() || TransType == TransTypeEnum.ICSOutsourcingIssueDoNegativeApply.GetDescription()
|| TransType == TransTypeEnum.ICSOutsourcingIssueDoNegativeIssue.GetDescription()) || TransType == TransTypeEnum.ICSOutsourcingIssueDoNegativeIssue.GetDescription())
ICSOutsourcingService.OutsourcingIssueDoNegativeERP(TransType, Identification, cmd,language);
ICSOutsourcingService.OutsourcingIssueDoNegativeERP(TransType, Identification, cmd, language);
//委外入库 //委外入库
else if (TransType == TransTypeEnum.OutsourcingReceiveDoc.GetDescription()) else if (TransType == TransTypeEnum.OutsourcingReceiveDoc.GetDescription())
ICSOutsourcingService.OutsourcingReceiveDocERP(TransType, Identification, cmd,language);
ICSOutsourcingService.OutsourcingReceiveDocERP(TransType, Identification, cmd, language);
//生产退料 //生产退料
else if (TransType == TransTypeEnum.MOIssueDocNegative.GetDescription() else if (TransType == TransTypeEnum.MOIssueDocNegative.GetDescription()
|| TransType == TransTypeEnum.MOIssueDocNegativeApply.GetDescription() || TransType == TransTypeEnum.MOIssueDocNegativeApply.GetDescription()
|| TransType == TransTypeEnum.MOIssueDocNegativeIssue.GetDescription()) || TransType == TransTypeEnum.MOIssueDocNegativeIssue.GetDescription())
ICSManufactureService.MOIssueDocNegativeERP(TransType, Identification, cmd,language);
ICSManufactureService.MOIssueDocNegativeERP(TransType, Identification, cmd, language);
//生产入库 //生产入库
else if (TransType == TransTypeEnum.ManufactureReceiveDoc.GetDescription()) else if (TransType == TransTypeEnum.ManufactureReceiveDoc.GetDescription())
ICSManufactureService.ManufactureReceiveDocERP(TransType, Identification, cmd,language);
ICSManufactureService.ManufactureReceiveDocERP(TransType, Identification, cmd, language);
//开立的生产入库单 //开立的生产入库单
else if (TransType == TransTypeEnum.ManufactureReceive.GetDescription()) else if (TransType == TransTypeEnum.ManufactureReceive.GetDescription())
ICSManufactureService.ManufactureReceiveERP(TransType, Identification, cmd,language);
ICSManufactureService.ManufactureReceiveERP(TransType, Identification, cmd, language);
//销售退货 //销售退货
else if (TransType == TransTypeEnum.SalesShipmentDocNegative.GetDescription()) else if (TransType == TransTypeEnum.SalesShipmentDocNegative.GetDescription())
ICSSalesService.SalesShipmentDocNegativeERP(TransType, Identification, cmd,language);
ICSSalesService.SalesShipmentDocNegativeERP(TransType, Identification, cmd, language);
//两步调入 //两步调入
else if (TransType == TransTypeEnum.TwoStepTransferDocIn.GetDescription()) else if (TransType == TransTypeEnum.TwoStepTransferDocIn.GetDescription())
ICSWareHouseService.TwoStepTransferDocInERP(TransType, Identification, cmd,language);
ICSWareHouseService.TwoStepTransferDocInERP(TransType, Identification, cmd, language);
//销售退货-原条码 //销售退货-原条码
else if (TransType == TransTypeEnum.SalesReturnBack.GetDescription()) else if (TransType == TransTypeEnum.SalesReturnBack.GetDescription())
ICSSalesService.SalesReturnBackInERP(TransType, Identification, cmd,language);
ICSSalesService.SalesReturnBackInERP(TransType, Identification, cmd, language);
//其他入库 //其他入库
else if (TransType == TransTypeEnum.OtherInDoc.GetDescription()) else if (TransType == TransTypeEnum.OtherInDoc.GetDescription())
ICSWareHouseService.OtherInDocERP(TransType, Identification, cmd,language);
ICSWareHouseService.OtherInDocERP(TransType, Identification, cmd, language);
//拆卸单 //拆卸单
if (TransType == TransTypeEnum.DisassemblyDoc.GetDescription()) if (TransType == TransTypeEnum.DisassemblyDoc.GetDescription())
ICSWareHouseService.DisassemblyDocERP(TransType, Identification, cmd,language);
ICSWareHouseService.DisassemblyDocERP(TransType, Identification, cmd, language);
//归还 //归还
else if (TransType == TransTypeEnum.ReturnDoc.GetDescription()) else if (TransType == TransTypeEnum.ReturnDoc.GetDescription())
ICSWareHouseService.ReturnDocERP(TransType, Identification, cmd,language);
ICSWareHouseService.ReturnDocERP(TransType, Identification, cmd, language);
} }
DataTable table = GetData(Identification, 1, cmd); DataTable table = GetData(Identification, 1, cmd);
cmd.Transaction.Commit(); cmd.Transaction.Commit();
@ -1330,7 +1330,7 @@ namespace ICSSoft.DataProject
foreach (var itemInfo in item.detail) foreach (var itemInfo in item.detail)
{ {
//出库 //出库
ICSWareHouseLotInfoService.WareHouseLotInfoDown(Identification, item.TransCode, item.TransSequence, itemInfo.LotNo, itemInfo.CurrentQuantity,
ICSWareHouseLotInfoService.WareHouseLotInfoDown(Identification, item.TransCode, item.TransSequence, itemInfo.LotNo, itemInfo.CurrentQuantity,
item.User, item.WorkPoint, "3", TransTypeEnum.PurchaseReceiveDoctNegative.GetDescription<DBValue>(), cmd, language); item.User, item.WorkPoint, "3", TransTypeEnum.PurchaseReceiveDoctNegative.GetDescription<DBValue>(), cmd, language);
} }
} }
@ -1339,12 +1339,12 @@ namespace ICSSoft.DataProject
else if (TransType == TransTypeEnum.OutsourcingIssueDoc.GetDescription()) else if (TransType == TransTypeEnum.OutsourcingIssueDoc.GetDescription())
{ {
//更新源头单据数量 //更新源头单据数量
ICSOutsourcingService.OutsourcingIssueDoc(item.TransCode, item.TransSequence, item.Quantity, item.WorkPoint, cmd,language);
ICSOutsourcingService.OutsourcingIssueDoc(item.TransCode, item.TransSequence, item.Quantity, item.WorkPoint, cmd, language);
foreach (var itemInfo in item.detail) foreach (var itemInfo in item.detail)
{ {
//出库 //出库
ICSWareHouseLotInfoService.WareHouseLotInfoDown(Identification, item.TransCode, item.TransSequence, itemInfo.LotNo, itemInfo.CurrentQuantity,
ICSWareHouseLotInfoService.WareHouseLotInfoDown(Identification, item.TransCode, item.TransSequence, itemInfo.LotNo, itemInfo.CurrentQuantity,
item.User, item.WorkPoint, "3", TransTypeEnum.OutsourcingIssueDoc.GetDescription<DBValue>(), cmd, language); item.User, item.WorkPoint, "3", TransTypeEnum.OutsourcingIssueDoc.GetDescription<DBValue>(), cmd, language);
} }
} }
@ -1353,12 +1353,12 @@ namespace ICSSoft.DataProject
else if (TransType == TransTypeEnum.OutsourcingReturnBack.GetDescription()) else if (TransType == TransTypeEnum.OutsourcingReturnBack.GetDescription())
{ {
//更新源头单据数量 //更新源头单据数量
ICSOutsourcingService.OutsourcingReturnBack(item.TransCode, item.TransSequence, item.Quantity, item.WorkPoint, cmd,language);
ICSOutsourcingService.OutsourcingReturnBack(item.TransCode, item.TransSequence, item.Quantity, item.WorkPoint, cmd, language);
foreach (var itemInfo in item.detail) foreach (var itemInfo in item.detail)
{ {
//出库 //出库
ICSWareHouseLotInfoService.WareHouseLotInfoDown(Identification, item.TransCode, item.TransSequence, itemInfo.LotNo, itemInfo.CurrentQuantity,
ICSWareHouseLotInfoService.WareHouseLotInfoDown(Identification, item.TransCode, item.TransSequence, itemInfo.LotNo, itemInfo.CurrentQuantity,
item.User, item.WorkPoint, "3", TransTypeEnum.OutsourcingReturnBack.GetDescription<DBValue>(), cmd, language); item.User, item.WorkPoint, "3", TransTypeEnum.OutsourcingReturnBack.GetDescription<DBValue>(), cmd, language);
} }
} }
@ -1367,12 +1367,12 @@ namespace ICSSoft.DataProject
else if (TransType == TransTypeEnum.MOIssueDoc.GetDescription()) else if (TransType == TransTypeEnum.MOIssueDoc.GetDescription())
{ {
//更新源头单据数量 //更新源头单据数量
ICSManufactureService.MOIssueDoc(item.TransCode, item.TransSequence, item.Quantity, item.WorkPoint, cmd,language);
ICSManufactureService.MOIssueDoc(item.TransCode, item.TransSequence, item.Quantity, item.WorkPoint, cmd, language);
foreach (var itemInfo in item.detail) foreach (var itemInfo in item.detail)
{ {
//出库 //出库
ICSWareHouseLotInfoService.WareHouseLotInfoDown(Identification, item.TransCode, item.TransSequence, itemInfo.LotNo, itemInfo.CurrentQuantity,
ICSWareHouseLotInfoService.WareHouseLotInfoDown(Identification, item.TransCode, item.TransSequence, itemInfo.LotNo, itemInfo.CurrentQuantity,
item.User, item.WorkPoint, "3", TransTypeEnum.MOIssueDoc.GetDescription<DBValue>(), cmd, language); item.User, item.WorkPoint, "3", TransTypeEnum.MOIssueDoc.GetDescription<DBValue>(), cmd, language);
} }
} }
@ -1381,12 +1381,12 @@ namespace ICSSoft.DataProject
else if (TransType == TransTypeEnum.SalesShipmentDoc.GetDescription()) else if (TransType == TransTypeEnum.SalesShipmentDoc.GetDescription())
{ {
//更新源头单据数量 //更新源头单据数量
ICSSalesService.SalesShipmentDoc(item.TransCode, item.TransSequence, item.Quantity, item.WorkPoint, cmd,language);
ICSSalesService.SalesShipmentDoc(item.TransCode, item.TransSequence, item.Quantity, item.WorkPoint, cmd, language);
foreach (var itemInfo in item.detail) foreach (var itemInfo in item.detail)
{ {
//出库 //出库
ICSWareHouseLotInfoService.WareHouseLotInfoDown(Identification, item.TransCode, item.TransSequence, itemInfo.LotNo, itemInfo.CurrentQuantity,
ICSWareHouseLotInfoService.WareHouseLotInfoDown(Identification, item.TransCode, item.TransSequence, itemInfo.LotNo, itemInfo.CurrentQuantity,
item.User, item.WorkPoint, "3", TransTypeEnum.SalesShipmentDoc.GetDescription<DBValue>(), cmd, language); item.User, item.WorkPoint, "3", TransTypeEnum.SalesShipmentDoc.GetDescription<DBValue>(), cmd, language);
} }
} }
@ -1395,12 +1395,12 @@ namespace ICSSoft.DataProject
else if (TransType == TransTypeEnum.TwoStepTransferDocOut.GetDescription()) else if (TransType == TransTypeEnum.TwoStepTransferDocOut.GetDescription())
{ {
//更新源头单据数量 //更新源头单据数量
ICSWareHouseService.TwoStepTransferDocOut(item.TransCode, item.TransSequence, item.Quantity, item.WorkPoint, cmd,language);
ICSWareHouseService.TwoStepTransferDocOut(item.TransCode, item.TransSequence, item.Quantity, item.WorkPoint, cmd, language);
foreach (var itemInfo in item.detail) foreach (var itemInfo in item.detail)
{ {
//出库 //出库
ICSWareHouseLotInfoService.WareHouseLotInfoDown(Identification, item.TransCode, item.TransSequence, itemInfo.LotNo, itemInfo.CurrentQuantity,
ICSWareHouseLotInfoService.WareHouseLotInfoDown(Identification, item.TransCode, item.TransSequence, itemInfo.LotNo, itemInfo.CurrentQuantity,
item.User, item.WorkPoint, "6", TransTypeEnum.TwoStepTransferDocOut.GetDescription<DBValue>(), cmd, language); item.User, item.WorkPoint, "6", TransTypeEnum.TwoStepTransferDocOut.GetDescription<DBValue>(), cmd, language);
} }
} }
@ -1409,12 +1409,12 @@ namespace ICSSoft.DataProject
else if (TransType == TransTypeEnum.OtherOutDoc.GetDescription()) else if (TransType == TransTypeEnum.OtherOutDoc.GetDescription())
{ {
//更新源头单据数量 //更新源头单据数量
ICSWareHouseService.OtherOutDoc(item.TransCode, item.TransSequence, item.Quantity, item.WorkPoint, cmd,language);
ICSWareHouseService.OtherOutDoc(item.TransCode, item.TransSequence, item.Quantity, item.WorkPoint, cmd, language);
foreach (var itemInfo in item.detail) foreach (var itemInfo in item.detail)
{ {
//出库 //出库
ICSWareHouseLotInfoService.WareHouseLotInfoDown(Identification, item.TransCode, item.TransSequence, itemInfo.LotNo, itemInfo.CurrentQuantity,
ICSWareHouseLotInfoService.WareHouseLotInfoDown(Identification, item.TransCode, item.TransSequence, itemInfo.LotNo, itemInfo.CurrentQuantity,
item.User, item.WorkPoint, "3", TransTypeEnum.OtherOutDoc.GetDescription<DBValue>(), cmd, language); item.User, item.WorkPoint, "3", TransTypeEnum.OtherOutDoc.GetDescription<DBValue>(), cmd, language);
} }
} }
@ -1423,12 +1423,12 @@ namespace ICSSoft.DataProject
else if (TransType == TransTypeEnum.MOApply.GetDescription()) else if (TransType == TransTypeEnum.MOApply.GetDescription())
{ {
//更新源头单据数量 //更新源头单据数量
ICSManufactureService.MOApply(item.TransCode, item.TransSequence, item.Quantity, item.WorkPoint, cmd,language);
ICSManufactureService.MOApply(item.TransCode, item.TransSequence, item.Quantity, item.WorkPoint, cmd, language);
foreach (var itemInfo in item.detail) foreach (var itemInfo in item.detail)
{ {
//出库 //出库
ICSWareHouseLotInfoService.WareHouseLotInfoDown(Identification, item.TransCode, item.TransSequence, itemInfo.LotNo, itemInfo.CurrentQuantity,
ICSWareHouseLotInfoService.WareHouseLotInfoDown(Identification, item.TransCode, item.TransSequence, itemInfo.LotNo, itemInfo.CurrentQuantity,
item.User, item.WorkPoint, "3", TransTypeEnum.MOApply.GetDescription<DBValue>(), cmd, language); item.User, item.WorkPoint, "3", TransTypeEnum.MOApply.GetDescription<DBValue>(), cmd, language);
} }
} }
@ -1437,12 +1437,12 @@ namespace ICSSoft.DataProject
else if (TransType == TransTypeEnum.OOApply.GetDescription()) else if (TransType == TransTypeEnum.OOApply.GetDescription())
{ {
//更新源头单据数量 //更新源头单据数量
ICSOutsourcingService.OOApply(item.TransCode, item.TransSequence, item.Quantity, item.WorkPoint, cmd,language);
ICSOutsourcingService.OOApply(item.TransCode, item.TransSequence, item.Quantity, item.WorkPoint, cmd, language);
foreach (var itemInfo in item.detail) foreach (var itemInfo in item.detail)
{ {
//出库 //出库
ICSWareHouseLotInfoService.WareHouseLotInfoDown(Identification, item.TransCode, item.TransSequence, itemInfo.LotNo, itemInfo.CurrentQuantity,
ICSWareHouseLotInfoService.WareHouseLotInfoDown(Identification, item.TransCode, item.TransSequence, itemInfo.LotNo, itemInfo.CurrentQuantity,
item.User, item.WorkPoint, "3", TransTypeEnum.OOApply.GetDescription<DBValue>(), cmd, language); item.User, item.WorkPoint, "3", TransTypeEnum.OOApply.GetDescription<DBValue>(), cmd, language);
} }
} }
@ -1451,12 +1451,12 @@ namespace ICSSoft.DataProject
else if (TransType == TransTypeEnum.MOIssue.GetDescription()) else if (TransType == TransTypeEnum.MOIssue.GetDescription())
{ {
//更新源头单据数量 //更新源头单据数量
ICSManufactureService.MOIssue(item.TransCode, item.TransSequence, item.Quantity, item.WorkPoint, cmd,language);
ICSManufactureService.MOIssue(item.TransCode, item.TransSequence, item.Quantity, item.WorkPoint, cmd, language);
foreach (var itemInfo in item.detail) foreach (var itemInfo in item.detail)
{ {
//出库 //出库
ICSWareHouseLotInfoService.WareHouseLotInfoDown(Identification, item.TransCode, item.TransSequence, itemInfo.LotNo, itemInfo.CurrentQuantity,
ICSWareHouseLotInfoService.WareHouseLotInfoDown(Identification, item.TransCode, item.TransSequence, itemInfo.LotNo, itemInfo.CurrentQuantity,
item.User, item.WorkPoint, "3", TransTypeEnum.MOIssue.GetDescription<DBValue>(), cmd, language); item.User, item.WorkPoint, "3", TransTypeEnum.MOIssue.GetDescription<DBValue>(), cmd, language);
} }
} }
@ -1465,12 +1465,12 @@ namespace ICSSoft.DataProject
else if (TransType == TransTypeEnum.OOIssue.GetDescription()) else if (TransType == TransTypeEnum.OOIssue.GetDescription())
{ {
//更新源头单据数量 //更新源头单据数量
ICSOutsourcingService.OOIssue(item.TransCode, item.TransSequence, item.Quantity, item.WorkPoint, cmd,language);
ICSOutsourcingService.OOIssue(item.TransCode, item.TransSequence, item.Quantity, item.WorkPoint, cmd, language);
foreach (var itemInfo in item.detail) foreach (var itemInfo in item.detail)
{ {
//出库 //出库
ICSWareHouseLotInfoService.WareHouseLotInfoDown(Identification, item.TransCode, item.TransSequence, itemInfo.LotNo, itemInfo.CurrentQuantity,
ICSWareHouseLotInfoService.WareHouseLotInfoDown(Identification, item.TransCode, item.TransSequence, itemInfo.LotNo, itemInfo.CurrentQuantity,
item.User, item.WorkPoint, "3", TransTypeEnum.OOIssue.GetDescription<DBValue>(), cmd, language); item.User, item.WorkPoint, "3", TransTypeEnum.OOIssue.GetDescription<DBValue>(), cmd, language);
} }
} }
@ -1484,7 +1484,7 @@ namespace ICSSoft.DataProject
foreach (var itemInfo in item.detail) foreach (var itemInfo in item.detail)
{ {
//出库 //出库
ICSWareHouseLotInfoService.WareHouseLotInfoDown(Identification, item.TransCode, item.TransSequence, itemInfo.LotNo, itemInfo.CurrentQuantity,
ICSWareHouseLotInfoService.WareHouseLotInfoDown(Identification, item.TransCode, item.TransSequence, itemInfo.LotNo, itemInfo.CurrentQuantity,
item.User, item.WorkPoint, "3", TransTypeEnum.PurchaseReceive.GetDescription<DBValue>(), cmd, language); item.User, item.WorkPoint, "3", TransTypeEnum.PurchaseReceive.GetDescription<DBValue>(), cmd, language);
} }
} }
@ -1493,12 +1493,12 @@ namespace ICSSoft.DataProject
else if (TransType == TransTypeEnum.OutsourcingReceiveDocNegative.GetDescription()) else if (TransType == TransTypeEnum.OutsourcingReceiveDocNegative.GetDescription())
{ {
//更新源头单据数量 //更新源头单据数量
ICSOutsourcingService.OutsourcingReceiveDocNegative(item.TransCode, item.TransSequence, item.Quantity, item.WorkPoint, cmd,language);
ICSOutsourcingService.OutsourcingReceiveDocNegative(item.TransCode, item.TransSequence, item.Quantity, item.WorkPoint, cmd, language);
foreach (var itemInfo in item.detail) foreach (var itemInfo in item.detail)
{ {
//出库 //出库
ICSWareHouseLotInfoService.WareHouseLotInfoDown(Identification, item.TransCode, item.TransSequence, itemInfo.LotNo, itemInfo.CurrentQuantity,
ICSWareHouseLotInfoService.WareHouseLotInfoDown(Identification, item.TransCode, item.TransSequence, itemInfo.LotNo, itemInfo.CurrentQuantity,
item.User, item.WorkPoint, "3", TransTypeEnum.OutsourcingReceiveDocNegative.GetDescription<DBValue>(), cmd, language); item.User, item.WorkPoint, "3", TransTypeEnum.OutsourcingReceiveDocNegative.GetDescription<DBValue>(), cmd, language);
} }
} }
@ -1507,12 +1507,12 @@ namespace ICSSoft.DataProject
else if (TransType == TransTypeEnum.BrrowDoc.GetDescription()) else if (TransType == TransTypeEnum.BrrowDoc.GetDescription())
{ {
//更新源头单据数量 //更新源头单据数量
ICSWareHouseService.BrrowDoc(item.TransCode, item.TransSequence, item.Quantity, item.WorkPoint, cmd,language);
ICSWareHouseService.BrrowDoc(item.TransCode, item.TransSequence, item.Quantity, item.WorkPoint, cmd, language);
foreach (var itemInfo in item.detail) foreach (var itemInfo in item.detail)
{ {
//出库 //出库
ICSWareHouseLotInfoService.WareHouseLotInfoDown(Identification, item.TransCode, item.TransSequence, itemInfo.LotNo, itemInfo.CurrentQuantity,
ICSWareHouseLotInfoService.WareHouseLotInfoDown(Identification, item.TransCode, item.TransSequence, itemInfo.LotNo, itemInfo.CurrentQuantity,
item.User, item.WorkPoint, "3", TransTypeEnum.BrrowDoc.GetDescription<DBValue>(), cmd, language); item.User, item.WorkPoint, "3", TransTypeEnum.BrrowDoc.GetDescription<DBValue>(), cmd, language);
} }
} }
@ -1526,43 +1526,43 @@ namespace ICSSoft.DataProject
ICSPurchaseService.PurchaseReceiveDoctNegativeERP(TransType, Identification, cmd, language); ICSPurchaseService.PurchaseReceiveDoctNegativeERP(TransType, Identification, cmd, language);
//委外发料 //委外发料
else if (TransType == TransTypeEnum.OutsourcingIssueDoc.GetDescription()) else if (TransType == TransTypeEnum.OutsourcingIssueDoc.GetDescription())
ICSOutsourcingService.OutsourcingIssueDocERP(TransType, Identification, cmd,language);
ICSOutsourcingService.OutsourcingIssueDocERP(TransType, Identification, cmd, language);
//委外退货 //委外退货
else if (TransType == TransTypeEnum.OutsourcingReturnBack.GetDescription()) else if (TransType == TransTypeEnum.OutsourcingReturnBack.GetDescription())
ICSOutsourcingService.OutsourcingReturnBackERP(TransType, Identification, cmd,language);
ICSOutsourcingService.OutsourcingReturnBackERP(TransType, Identification, cmd, language);
//生产发料 //生产发料
else if (TransType == TransTypeEnum.MOIssueDoc.GetDescription()) else if (TransType == TransTypeEnum.MOIssueDoc.GetDescription())
ICSManufactureService.MOIssueDocERP(TransType, Identification, cmd,language);
ICSManufactureService.MOIssueDocERP(TransType, Identification, cmd, language);
//销售出库 //销售出库
else if (TransType == TransTypeEnum.SalesShipmentDoc.GetDescription()) else if (TransType == TransTypeEnum.SalesShipmentDoc.GetDescription())
ICSSalesService.SalesShipmentDocERP(TransType, Identification, cmd,language);
ICSSalesService.SalesShipmentDocERP(TransType, Identification, cmd, language);
//两步调出 //两步调出
else if (TransType == TransTypeEnum.TwoStepTransferDocOut.GetDescription()) else if (TransType == TransTypeEnum.TwoStepTransferDocOut.GetDescription())
ICSWareHouseService.TwoStepTransferDocOutERP(TransType, Identification, cmd,language);
ICSWareHouseService.TwoStepTransferDocOutERP(TransType, Identification, cmd, language);
//其他出库 //其他出库
else if (TransType == TransTypeEnum.OtherOutDoc.GetDescription()) else if (TransType == TransTypeEnum.OtherOutDoc.GetDescription())
ICSWareHouseService.OtherOutDocERP(TransType, Identification, cmd,language);
ICSWareHouseService.OtherOutDocERP(TransType, Identification, cmd, language);
//领料申请单发料 //领料申请单发料
if (TransType == TransTypeEnum.MOApply.GetDescription()) if (TransType == TransTypeEnum.MOApply.GetDescription())
ICSManufactureService.MOApplyERP(TransType, Identification, cmd,language);
ICSManufactureService.MOApplyERP(TransType, Identification, cmd, language);
//委外领料申请单发料 //委外领料申请单发料
if (TransType == TransTypeEnum.OOApply.GetDescription()) if (TransType == TransTypeEnum.OOApply.GetDescription())
ICSOutsourcingService.OOApplyERP(TransType, Identification, cmd,language);
ICSOutsourcingService.OOApplyERP(TransType, Identification, cmd, language);
//开立材料出库 //开立材料出库
if (TransType == TransTypeEnum.MOIssue.GetDescription()) if (TransType == TransTypeEnum.MOIssue.GetDescription())
ICSManufactureService.MOIssueERP(TransType, Identification, cmd,language);
ICSManufactureService.MOIssueERP(TransType, Identification, cmd, language);
//开立委外材料出库 //开立委外材料出库
if (TransType == TransTypeEnum.OOIssue.GetDescription()) if (TransType == TransTypeEnum.OOIssue.GetDescription())
ICSOutsourcingService.OOIssueERP(TransType, Identification, cmd,language);
ICSOutsourcingService.OOIssueERP(TransType, Identification, cmd, language);
//开立红字入库单 //开立红字入库单
if (TransType == TransTypeEnum.PurchaseReceive.GetDescription()) if (TransType == TransTypeEnum.PurchaseReceive.GetDescription())
ICSPurchaseService.PurchaseReceiveERP(TransType, Identification, cmd, language); ICSPurchaseService.PurchaseReceiveERP(TransType, Identification, cmd, language);
//开立委外红字入库单 //开立委外红字入库单
if (TransType == TransTypeEnum.OutsourcingReceiveDocNegative.GetDescription()) if (TransType == TransTypeEnum.OutsourcingReceiveDocNegative.GetDescription())
ICSOutsourcingService.OutsourcingReceiveDocNegativeERP(TransType, Identification, cmd,language);
ICSOutsourcingService.OutsourcingReceiveDocNegativeERP(TransType, Identification, cmd, language);
//借用 //借用
if (TransType == TransTypeEnum.BrrowDoc.GetDescription()) if (TransType == TransTypeEnum.BrrowDoc.GetDescription())
ICSWareHouseService.BrrowDocERP(TransType, Identification, cmd,language);
ICSWareHouseService.BrrowDocERP(TransType, Identification, cmd, language);
} }
DataTable table = GetData(Identification, 2, cmd); DataTable table = GetData(Identification, 2, cmd);
@ -1693,7 +1693,7 @@ namespace ICSSoft.DataProject
{ {
throw new Exception(language.GetNameByCode("WMSAPIInfo011")); //"到货单信息创建失败！"); throw new Exception(language.GetNameByCode("WMSAPIInfo011")); //"到货单信息创建失败！");
} }
ICSPurchaseService.DeliveryNoticeERP(Code, item.WorkPoint, cmd,language);
ICSPurchaseService.DeliveryNoticeERP(Code, item.WorkPoint, cmd, language);
asncodes += "'" + item.ASNCode + item.WorkPoint + "',"; asncodes += "'" + item.ASNCode + item.WorkPoint + "',";
} }
if (string.IsNullOrWhiteSpace(asncodes)) if (string.IsNullOrWhiteSpace(asncodes))
@ -2012,23 +2012,7 @@ namespace ICSSoft.DataProject
} }
} }
//校验退料数量是否超出领料数量 //校验退料数量是否超出领料数量
sql = @"DECLARE @PickID VARCHAR(10)
SELECT @PickID=b.PickID
FROM ICSOApplyNegDetail a
INNER JOIN ICSOOPick b ON a.SourceDetailID=b.PickID AND a.WorkPoint=b.WorkPoint
INNER JOIN ICSOApplyNeg c ON a.OApplyNegCode=c.OApplyNegCode AND a.WorkPoint=c.WorkPoint
WHERE c.ID='{0}' AND a.WorkPoint='{1}'
GROUP BY b.PickID
HAVING MAX(b.Quantity)<SUM(a.Quantity)
IF (@PickID IS NOT NULL)
BEGIN
DECLARE @InvCode VARCHAR(100)
SELECT @InvCode='" + language.GetNameByCode("WMSAPIInfo064") + @"' FROM ICSMOPick WHERE PickID=@PickID AND WorkPoint='{1}'
RAISERROR(@InvCode,16,1);
RETURN
END ";
sql = string.Format(sql, item.id, item.WorkPoint);
sql = CheckOutsourcingIssueDoc(item.Type, item.id, item.WorkPoint, language);
DBHelper.ExecuteNonQuery(sql, cmd); DBHelper.ExecuteNonQuery(sql, cmd);
codes += "'" + Code + item.WorkPoint + "',"; codes += "'" + Code + item.WorkPoint + "',";
} }
@ -2096,6 +2080,74 @@ namespace ICSSoft.DataProject
} }
} }
private static string CheckOutsourcingIssueDoc(string Type, string ID, string WorkPoint, Dictionary<string, string> language)
{
string sql = string.Empty;
if (Type == "1")
{
sql = @"DECLARE @PickID VARCHAR(10)
SELECT @PickID=b.PickID
FROM ICSOApplyNegDetail a
INNER JOIN ICSOOPick b ON a.SourceDetailID=b.PickID AND a.WorkPoint=b.WorkPoint
INNER JOIN ICSOApplyNeg c ON a.OApplyNegCode=c.OApplyNegCode AND a.WorkPoint=c.WorkPoint
WHERE c.ID='{0}' AND c.Type='{2}' AND a.WorkPoint='{1}'
GROUP BY b.PickID
HAVING MAX(b.Quantity)<SUM(a.Quantity)
IF (@PickID IS NOT NULL)
BEGIN
DECLARE @InvCode VARCHAR(100)
SELECT @InvCode='" + language.GetNameByCode("WMSAPIInfo064") + @"' FROM ICSOOPick WHERE PickID=@PickID AND WorkPoint='{1}'
RAISERROR(@InvCode,16,1);
RETURN
END ";
}
else if (Type == "2")
{
sql = @"DECLARE @ApplyDetailID VARCHAR(10)
SELECT @ApplyDetailID=b.ApplyDetailID
FROM ICSOApplyNegDetail a
INNER JOIN ICSOApply b ON a.SourceDetailID=b.ApplyDetailID AND a.WorkPoint=b.WorkPoint
INNER JOIN ICSOApplyNeg c ON a.OApplyNegCode=c.OApplyNegCode AND a.WorkPoint=c.WorkPoint
WHERE c.ID='{0}' AND c.Type='{2}' AND a.WorkPoint='{1}'
GROUP BY b.ApplyDetailID
HAVING MAX(b.Quantity)<SUM(a.Quantity)
IF (@ApplyDetailID IS NOT NULL)
BEGIN
DECLARE @InvCode VARCHAR(100)
SELECT @InvCode='" + language.GetNameByCode("WMSAPIInfo064") + @"' FROM ICSOApply WHERE ApplyDetailID=@ApplyDetailID AND WorkPoint='{1}'
RAISERROR(@InvCode,16,1);
RETURN
END ";
}
else if (Type == "3")
{
sql = @"DECLARE @IssueDetailID VARCHAR(10)
SELECT @IssueDetailID=b.IssueDetailID
FROM ICSOApplyNegDetail a
INNER JOIN ICSOIssue b ON a.SourceDetailID=b.IssueDetailID AND a.WorkPoint=b.WorkPoint
INNER JOIN ICSOApplyNeg c ON a.OApplyNegCode=c.OApplyNegCode AND a.WorkPoint=c.WorkPoint
WHERE c.ID='{0}' AND c.Type='{2}' AND a.WorkPoint='{1}'
GROUP BY b.IssueDetailID
HAVING MAX(b.Quantity)<SUM(a.Quantity)
IF (@IssueDetailID IS NOT NULL)
BEGIN
DECLARE @InvCode VARCHAR(100)
SELECT @InvCode='" + language.GetNameByCode("WMSAPIInfo064") + @"' FROM ICSOIssue WHERE IssueDetailID=@IssueDetailID AND WorkPoint='{1}'
RAISERROR(@InvCode,16,1);
RETURN
END ";
}
else
{
throw new Exception(language.GetNameByCode("WMSAPIInfo003"));//"类型不符！");
}
sql = string.Format(sql, ID, WorkPoint, Type);
return sql;
}
/// <summary> /// <summary>
/// 委外退料 修改 /// 委外退料 修改
/// </summary> /// </summary>
@ -2181,23 +2233,7 @@ namespace ICSSoft.DataProject
} }
} }
//校验退料数量是否超出领料数量 //校验退料数量是否超出领料数量
sql = @"DECLARE @PickID VARCHAR(10)
SELECT @PickID=b.PickID
FROM ICSOApplyNegDetail a
INNER JOIN ICSOOPick b ON a.SourceDetailID=b.PickID AND a.WorkPoint=b.WorkPoint
INNER JOIN ICSOApplyNeg c ON a.OApplyNegCode=c.OApplyNegCode AND a.WorkPoint=c.WorkPoint
WHERE c.ID='{0}' AND a.WorkPoint='{1}'
GROUP BY b.PickID
HAVING MAX(b.Quantity)<SUM(a.Quantity)
IF (@PickID IS NOT NULL)
BEGIN
DECLARE @InvCode VARCHAR(100)
SELECT @InvCode='" + language.GetNameByCode("WMSAPIInfo064") + @"' FROM ICSMOPick WHERE PickID=@PickID AND WorkPoint='{1}'
RAISERROR(@InvCode,16,1);
RETURN
END ";
sql = string.Format(sql, item.id, item.WorkPoint);
sql = CheckOutsourcingIssueDoc(item.Type, item.id, item.WorkPoint, language);
DBHelper.ExecuteNonQuery(sql, cmd); DBHelper.ExecuteNonQuery(sql, cmd);
ids += "'" + item.id + "',"; ids += "'" + item.id + "',";
} }
@ -2494,7 +2530,7 @@ namespace ICSSoft.DataProject
{ {
throw new Exception(language.GetNameByCode("WMSAPIInfo011")); //"到货单信息创建失败！"); throw new Exception(language.GetNameByCode("WMSAPIInfo011")); //"到货单信息创建失败！");
} }
ICSOutsourcingService.OutsourcingDeliveryNoticeERP(Code, item.WorkPoint, cmd,language);
ICSOutsourcingService.OutsourcingDeliveryNoticeERP(Code, item.WorkPoint, cmd, language);
asncodes += "'" + item.OASNCode + item.WorkPoint + "',"; asncodes += "'" + item.OASNCode + item.WorkPoint + "',";
} }
if (string.IsNullOrWhiteSpace(asncodes)) if (string.IsNullOrWhiteSpace(asncodes))
@ -2791,7 +2827,7 @@ namespace ICSSoft.DataProject
INSERT INTO ICSMOApplyNeg(ID,ApplyNegCode,WHCode,Status,Type,Memo,CreatePerson,CreateDateTime,MUSER,MUSERName,MTIME,WorkPoint,EATTRIBUTE1) INSERT INTO ICSMOApplyNeg(ID,ApplyNegCode,WHCode,Status,Type,Memo,CreatePerson,CreateDateTime,MUSER,MUSERName,MTIME,WorkPoint,EATTRIBUTE1)
VALUES (NEWID(),'{0}','{1}','1','{5}','','{2}','{3}','{2}',(select F_RealName from Sys_SRM_User where F_Account='{2}' and F_Location='{4}'),'{3}','{4}','')"; VALUES (NEWID(),'{0}','{1}','1','{5}','','{2}','{3}','{2}',(select F_RealName from Sys_SRM_User where F_Account='{2}' and F_Location='{4}'),'{3}','{4}','')";
sql = string.Format(sql, Code, item.WHCode, item.User, item.MTime, item.WorkPoint,item.Type);
sql = string.Format(sql, Code, item.WHCode, item.User, item.MTime, item.WorkPoint, item.Type);
if (!DBHelper.ExecuteNonQuery(sql, cmd)) if (!DBHelper.ExecuteNonQuery(sql, cmd))
{ {
@ -2814,23 +2850,7 @@ namespace ICSSoft.DataProject
} }
} }
//校验退料数量是否超出领料数量 //校验退料数量是否超出领料数量
sql = @"DECLARE @PickID VARCHAR(10)
SELECT @PickID=b.PickID
FROM ICSMOApplyNegDetail a
INNER JOIN ICSMOPick b ON a.SourceDetailID=b.PickID AND a.WorkPoint=b.WorkPoint
INNER JOIN ICSMOApplyNeg c ON a.ApplyNegCode=c.ApplyNegCode AND a.WorkPoint=c.WorkPoint
WHERE c.ID='{0}' AND a.WorkPoint='{1}'
GROUP BY b.PickID
HAVING MAX(b.Quantity)<SUM(a.Quantity)
IF (@PickID IS NOT NULL)
BEGIN
DECLARE @InvCode VARCHAR(100)
SELECT @InvCode='" + language.GetNameByCode("WMSAPIInfo064") + @"' FROM ICSMOPick WHERE PickID=@PickID AND WorkPoint='{1}'
RAISERROR(@InvCode,16,1);
RETURN
END ";
sql = string.Format(sql, item.ID, item.WorkPoint);
sql = CheckMOIssueDoc(item.Type, item.ID, item.WorkPoint, language);
DBHelper.ExecuteNonQuery(sql, cmd); DBHelper.ExecuteNonQuery(sql, cmd);
codes += "'" + Code + item.WorkPoint + "',"; codes += "'" + Code + item.WorkPoint + "',";
} }
@ -2897,7 +2917,73 @@ namespace ICSSoft.DataProject
} }
} }
} }
private static string CheckMOIssueDoc(string Type, string ID, string WorkPoint, Dictionary<string, string> language)
{
string sql = string.Empty;
if (Type == "1")
{
sql = @"DECLARE @PickID VARCHAR(10)
SELECT @PickID=b.PickID
FROM ICSMOApplyNegDetail a
INNER JOIN ICSMOPick b ON a.SourceDetailID=b.PickID AND a.WorkPoint=b.WorkPoint
INNER JOIN ICSMOApplyNeg c ON a.ApplyNegCode=c.ApplyNegCode AND a.WorkPoint=c.WorkPoint
WHERE c.ID='{0}' AND c.Type='{2}' AND a.WorkPoint='{1}'
GROUP BY b.PickID
HAVING MAX(b.Quantity)<SUM(a.Quantity)
IF (@PickID IS NOT NULL)
BEGIN
DECLARE @InvCode VARCHAR(100)
SELECT @InvCode='" + language.GetNameByCode("WMSAPIInfo064") + @"' FROM ICSMOPick WHERE PickID=@PickID AND WorkPoint='{1}'
RAISERROR(@InvCode,16,1);
RETURN
END ";
}
else if (Type == "2")
{
sql = @"DECLARE @ApplyDetailID VARCHAR(10)
SELECT @ApplyDetailID=b.ApplyDetailID
FROM ICSMOApplyNegDetail a
INNER JOIN ICSMOApply b ON a.SourceDetailID=b.ApplyDetailID AND a.WorkPoint=b.WorkPoint
INNER JOIN ICSMOApplyNeg c ON a.ApplyNegCode=c.ApplyNegCode AND a.WorkPoint=c.WorkPoint
WHERE c.ID='{0}' AND c.Type='{2}' AND a.WorkPoint='{1}'
GROUP BY b.ApplyDetailID
HAVING MAX(b.Quantity)<SUM(a.Quantity)
IF (@ApplyDetailID IS NOT NULL)
BEGIN
DECLARE @InvCode VARCHAR(100)
SELECT @InvCode='" + language.GetNameByCode("WMSAPIInfo064") + @"' FROM ICSMOApply WHERE ApplyDetailID=@ApplyDetailID AND WorkPoint='{1}'
RAISERROR(@InvCode,16,1);
RETURN
END ";
}
else if (Type == "3")
{
sql = @"DECLARE @IssueDetailID VARCHAR(10)
SELECT @IssueDetailID=b.IssueDetailID
FROM ICSMOApplyNegDetail a
INNER JOIN ICSMOIssue b ON a.SourceDetailID=b.IssueDetailID AND a.WorkPoint=b.WorkPoint
INNER JOIN ICSMOApplyNeg c ON a.ApplyNegCode=c.ApplyNegCode AND a.WorkPoint=c.WorkPoint
WHERE c.ID='{0}' AND c.Type='{2}' AND a.WorkPoint='{1}'
GROUP BY b.IssueDetailID
HAVING MAX(b.Quantity)<SUM(a.Quantity)
IF (@IssueDetailID IS NOT NULL)
BEGIN
DECLARE @InvCode VARCHAR(100)
SELECT @InvCode='" + language.GetNameByCode("WMSAPIInfo064") + @"' FROM ICSMOIssue WHERE IssueDetailID=@IssueDetailID AND WorkPoint='{1}'
RAISERROR(@InvCode,16,1);
RETURN
END ";
}
else
{
throw new Exception(language.GetNameByCode("WMSAPIInfo003"));//"类型不符！");
}
sql = string.Format(sql, ID, WorkPoint, Type);
return sql;
}
/// <summary> /// <summary>
/// 生产退料 修改 /// 生产退料 修改
/// </summary> /// </summary>
@ -2982,23 +3068,7 @@ namespace ICSSoft.DataProject
} }
} }
//校验退料数量是否超出领料数量 //校验退料数量是否超出领料数量
sql = @"DECLARE @PickID VARCHAR(10)
SELECT @PickID=b.PickID
FROM ICSMOApplyNegDetail a
INNER JOIN ICSMOPick b ON a.SourceDetailID=b.PickID AND a.WorkPoint=b.WorkPoint
INNER JOIN ICSMOApplyNeg c ON a.ApplyNegCode=c.ApplyNegCode AND a.WorkPoint=c.WorkPoint
WHERE c.ID='{0}' AND a.WorkPoint='{1}'
GROUP BY b.PickID
HAVING MAX(b.Quantity)<SUM(a.Quantity)
IF (@PickID IS NOT NULL)
BEGIN
DECLARE @InvCode VARCHAR(100)
SELECT @InvCode='" + language.GetNameByCode("WMSAPIInfo064") + @"' FROM ICSMOPick WHERE PickID=@PickID AND WorkPoint='{1}'
RAISERROR(@InvCode,16,1);
RETURN
END ";
sql = string.Format(sql, item.ID, item.WorkPoint);
sql = CheckMOIssueDoc(item.Type, item.ID, item.WorkPoint, language);
DBHelper.ExecuteNonQuery(sql, cmd); DBHelper.ExecuteNonQuery(sql, cmd);
ids += "'" + item.ID + "',"; ids += "'" + item.ID + "',";
} }
@ -3264,14 +3334,14 @@ namespace ICSSoft.DataProject
DBHelper.ExecuteNonQuery(sql, cmd); DBHelper.ExecuteNonQuery(sql, cmd);
//更新源头单据信息 //更新源头单据信息
ICSWareHouseService.OneStepTransferDocIn(item.TransCode, item.TransSequence, item.WorkPoint, itemInfo.CurrentQuantity, cmd,language);
ICSWareHouseService.OneStepTransferDocIn(item.TransCode, item.TransSequence, item.WorkPoint, itemInfo.CurrentQuantity, cmd, language);
//更新条码信息 //更新条码信息
ICSWareHouseLotInfoService.WareHouseLotInfoTransfer(Identification, item.TransCode, item.TransSequence, itemInfo.WarehouseCode, itemInfo.LocationCode,
ICSWareHouseLotInfoService.WareHouseLotInfoTransfer(Identification, item.TransCode, item.TransSequence, itemInfo.WarehouseCode, itemInfo.LocationCode,
itemInfo.LotNo, itemInfo.CurrentQuantity, item.User, item.WorkPoint, "6", "21", cmd, language); itemInfo.LotNo, itemInfo.CurrentQuantity, item.User, item.WorkPoint, "6", "21", cmd, language);
} }
} }
ICSWareHouseService.OneStepTransferDocInERP(TransTypeEnum.OneStepTransferDocIn.GetDescription(), Identification, cmd,language);
ICSWareHouseService.OneStepTransferDocInERP(TransTypeEnum.OneStepTransferDocIn.GetDescription(), Identification, cmd, language);
DataTable table = GetData(Identification, 3, cmd); DataTable table = GetData(Identification, 3, cmd);
cmd.Transaction.Commit(); cmd.Transaction.Commit();
@ -3350,7 +3420,7 @@ namespace ICSSoft.DataProject
DBHelper.ExecuteNonQuery(sql, cmd); DBHelper.ExecuteNonQuery(sql, cmd);
//更新条码信息 //更新条码信息
ICSWareHouseLotInfoService.WareHouseLotInfoLibrary(Identification, item.TransCode, item.TransSequence, item.WarehouseCode, item.LocationCode, item.LotNo,
ICSWareHouseLotInfoService.WareHouseLotInfoLibrary(Identification, item.TransCode, item.TransSequence, item.WarehouseCode, item.LocationCode, item.LotNo,
item.User, item.WorkPoint, "7", "29", cmd, language); item.User, item.WorkPoint, "7", "29", cmd, language);
} }
DataTable table = GetData(Identification, 3, cmd); DataTable table = GetData(Identification, 3, cmd);
@ -3410,22 +3480,22 @@ namespace ICSSoft.DataProject
throw new Exception(language.GetNameByCode("WMSAPIInfo028"));//"明细信息不能为空！"); throw new Exception(language.GetNameByCode("WMSAPIInfo028"));//"明细信息不能为空！");
} }
//合并前日志 //合并前日志
ICSWareHouseLotInfoService.WareHouseLotInfoLog(Identification, item.LotNo, item.User, item.WorkPoint, "5",
ICSWareHouseLotInfoService.WareHouseLotInfoLog(Identification, item.LotNo, item.User, item.WorkPoint, "5",
TransTypeEnum.LOTMergeBefore.GetDescription<DBValue>(), cmd, language); TransTypeEnum.LOTMergeBefore.GetDescription<DBValue>(), cmd, language);
foreach (var info in item.detail) foreach (var info in item.detail)
{ {
//合并前日志 //合并前日志
ICSWareHouseLotInfoService.WareHouseLotInfoLog(Identification, info.CurrentLotNo, item.User, item.WorkPoint, "5",
ICSWareHouseLotInfoService.WareHouseLotInfoLog(Identification, info.CurrentLotNo, item.User, item.WorkPoint, "5",
TransTypeEnum.LOTMergeBefore.GetDescription<DBValue>(), cmd, language); TransTypeEnum.LOTMergeBefore.GetDescription<DBValue>(), cmd, language);
//更新条码信息 //更新条码信息
ICSWareHouseLotInfoService.WareHouseLotInfoMerge(Identification, item.LotNo, info.CurrentLotNo, info.CurrentQuantity, item.User, item.WorkPoint, "5",
ICSWareHouseLotInfoService.WareHouseLotInfoMerge(Identification, item.LotNo, info.CurrentLotNo, info.CurrentQuantity, item.User, item.WorkPoint, "5",
TransTypeEnum.LOTMergeAfter.GetDescription<DBValue>(), cmd, language); TransTypeEnum.LOTMergeAfter.GetDescription<DBValue>(), cmd, language);
} }
//合并后日志 //合并后日志
ICSWareHouseLotInfoService.WareHouseLotInfoLog(Identification, item.LotNo, item.User, item.WorkPoint, "5",
ICSWareHouseLotInfoService.WareHouseLotInfoLog(Identification, item.LotNo, item.User, item.WorkPoint, "5",
TransTypeEnum.LOTMergeAfter.GetDescription<DBValue>(), cmd, language); TransTypeEnum.LOTMergeAfter.GetDescription<DBValue>(), cmd, language);
} }
DataTable table = GetData(Identification, 1, cmd); DataTable table = GetData(Identification, 1, cmd);
@ -3486,18 +3556,18 @@ namespace ICSSoft.DataProject
throw new Exception(language.GetNameByCode("WMSAPIInfo028"));//"明细信息不能为空！"); throw new Exception(language.GetNameByCode("WMSAPIInfo028"));//"明细信息不能为空！");
} }
//拆分前日志 //拆分前日志
ICSWareHouseLotInfoService.WareHouseLotInfoLog(Identification, item.LotNo, item.User, item.WorkPoint, "4",
ICSWareHouseLotInfoService.WareHouseLotInfoLog(Identification, item.LotNo, item.User, item.WorkPoint, "4",
TransTypeEnum.LOTSplitBefore.GetDescription<DBValue>(), cmd, language); TransTypeEnum.LOTSplitBefore.GetDescription<DBValue>(), cmd, language);
foreach (var info in item.detail) foreach (var info in item.detail)
{ {
//更新条码信息 //更新条码信息
ICSWareHouseLotInfoService.WareHouseLotInfoSplit(Identification, item.LotNo, info.CurrentLotNo, info.CurrentQuantity, item.User, item.WorkPoint, "4",
ICSWareHouseLotInfoService.WareHouseLotInfoSplit(Identification, item.LotNo, info.CurrentLotNo, info.CurrentQuantity, item.User, item.WorkPoint, "4",
TransTypeEnum.LOTSplitAfter.GetDescription<DBValue>(), cmd, language); TransTypeEnum.LOTSplitAfter.GetDescription<DBValue>(), cmd, language);
} }
//拆分后日志 //拆分后日志
ICSWareHouseLotInfoService.WareHouseLotInfoLog(Identification, item.LotNo, item.User, item.WorkPoint, "4",
ICSWareHouseLotInfoService.WareHouseLotInfoLog(Identification, item.LotNo, item.User, item.WorkPoint, "4",
TransTypeEnum.LOTSplitAfter.GetDescription<DBValue>(), cmd, language); TransTypeEnum.LOTSplitAfter.GetDescription<DBValue>(), cmd, language);
} }
@ -3648,7 +3718,7 @@ namespace ICSSoft.DataProject
//2 - 提醒 //2 - 提醒
//3 - 限制 //3 - 限制
sql = string.Format(sql, LotNo, WorkPoitCode); sql = string.Format(sql, LotNo, WorkPoitCode);
if(!string.IsNullOrWhiteSpace(ScanLotCode))
if (!string.IsNullOrWhiteSpace(ScanLotCode))
{ {
sql = sql.Replace("1=1", "a.LotNO NOT IN (" + ScanLotCode + ")"); sql = sql.Replace("1=1", "a.LotNO NOT IN (" + ScanLotCode + ")");
} }

Write Preview
Loading…
Cancel
Save