From 3e58dee31a30ee20770803a7035deb4890156bb4 Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期五, 16 九月 2022 13:25:26 +0800
Subject: [PATCH] 采购订单生成送货单保存方法修改 解决多次保存时的报错
---
WebAPI/Controllers/BarCodeController.cs | 61 ++++++++++++------------------
1 files changed, 24 insertions(+), 37 deletions(-)
diff --git a/WebAPI/Controllers/BarCodeController.cs b/WebAPI/Controllers/BarCodeController.cs
index 9250a1e..c560dca 100644
--- a/WebAPI/Controllers/BarCodeController.cs
+++ b/WebAPI/Controllers/BarCodeController.cs
@@ -585,6 +585,27 @@
HSumQty = ClsPub.isDoule(oItemSub.HQty); //HWXQtyCol
for (int i = 0; i < HBQty; i++)
{
+ LSH = LSH + 1;
+ LSH2 = LSH.ToString();
+ while (LSH2.Length < LSHlen) //濡傛灉娴佹按鍙峰皬浜�6浣嶆暟鍓嶉潰琛�0
+ {
+ LSH2 = "0" + LSH2;
+ }
+ sDate = ClsPub.GetServerDate(0);
+ sYear = ClsPub.isDate(sDate).Year.ToString().Substring(2, 2);
+ sPeriod = "0" + ClsPub.isDate(sDate).Month.ToString();
+ sPeriod = sPeriod.Substring(sPeriod.Length - 2, 2);
+ sDay = "0" + ClsPub.isDate(sDate).Day.ToString();
+ sDay = sDay.Substring(sDay.Length - 2, 2);
+ //==================================
+ TM = HNumber + sYear + sPeriod + sDay + LSH2;
+ while (TM.Length < SumLen) //濡傛灉鏉＄爜灏忎簬12浣嶆暟鍓嶉潰琛�0
+ {
+ TM = "0" + TM;
+ }
+ //TM = "B" + TM;
+ TM = "SRM" + "B" + TM;
+
if (HSumQty - HMinQty > 0)
{
WeiShu = "";
@@ -602,8 +623,6 @@
}
HMinQty = HSumQty;
}
- TM = $"{oItemSub.HMaterID}#{HMinQty}";
-
Model.ClsGy_BarCodeBill_WMS_Model bar = new Model.ClsGy_BarCodeBill_WMS_Model();
bar.HBarCode = TM;
bar.HMaterID = oItemSub.HMaterID;
@@ -695,7 +714,7 @@
TM2 = "0" + TM2;
}
bar2.HMaterID = oItemSub2.HMaterID;
- bar2.HBarCode = oItemSub2.HBarCode.Split('#')[0] + "#" + HWXQty.ToString();
+ bar2.HBarCode = oItemSub2.HBarCode + "-" + TM2;
bar2.HUnitID = oItemSub2.HUnitID;
bar2.HQty = HWXQty;
bar2.HBatchNo = DBUtility.ClsPub.isStrNull(oItemSub2.HBatchNo);
@@ -880,7 +899,6 @@
List<Model.ClsGy_MaterialList_WMS_Model> ls = new List<Model.ClsGy_MaterialList_WMS_Model>();
List<Model.ClsGy_BarCodeBill_WMS_Model> ls2 = new List<Model.ClsGy_BarCodeBill_WMS_Model>();
- List<Model.ClsGy_BarCodeBill_WMS_Model> ls3 = new List<Model.ClsGy_BarCodeBill_WMS_Model>();
ls = oListModels.getObjectByJson_MaterialList(msg3);
foreach (Model.ClsGy_MaterialList_WMS_Model oItemSub in ls)
@@ -937,8 +955,8 @@
WeiShu = "灏炬暟";
HMinQty = HSumQty - (HBQty - 1) * HMinQty;
}
- //TM = $"{oItemSub.HMaterID}#{HMinQty}";
- TM = $"{oItemSub.HMaterID}";
+ TM = $"{oItemSub.HMaterID}#{HMinQty}";
+ //TM = $"{oItemSub.HMaterID}";
Model.ClsGy_BarCodeBill_WMS_Model bar = new Model.ClsGy_BarCodeBill_WMS_Model();
bar.HBarCode = TM;
bar.HMaterID = oItemSub.HMaterID;
@@ -1009,37 +1027,6 @@
+ "," + HSourceInterID + "," + HSourceEntryID + ",'" + HSourceBillNo + "','" + HSourceBillType + "','" + HMTONO + "')";
oCn.RunProc(sql);
sql = "exec setLSH '" + DateTime.Today + "'";
- oCn.RunProc(sql);
- }
- }
- foreach (Model.ClsGy_BarCodeBill_WMS_Model oItemSub in ls3)
- {
- //LogService.Write("寰幆绗笁娆�:" + oItemSub.HSupID);
- if (ClsPub.isLong(oItemSub.HMaterID) != 0)
- {
- HBarCode = oItemSub.HBarCode.ToString();
- HMTONO = ClsPub.isStrNull(oItemSub.HMTONO);
- HBarCodeType = "绠卞彿鍐呮潯鐮�";
- HMaterID = ClsPub.isLong(oItemSub.HMaterID);
- HUnitID = ClsPub.isLong(oItemSub.HUnitID);
- HQty2 = ClsPub.isDoule(oItemSub.HQty);
- HBatchNo = ClsPub.isStrNull(oItemSub.HBatchNo);
- HSupID = oItemSub.HSupID;
- HKFPeriod = ClsPub.isInt(oItemSub.HKFPeriod);
- HKFDate = ClsPub.isStrNull(oItemSub.HKFDate);
- HKFDQDate = ClsPub.isStrNull(oItemSub.HKFDQDate);
- HSourceInterID = ClsPub.isLong(oItemSub.HSourceInterID);
- HSourceEntryID = ClsPub.isLong(oItemSub.HSourceEntryID);
- HSourceBillNo = ClsPub.isStrNull(oItemSub.HSourceBillNo);
- HSourceBillType = ClsPub.isStrNull(oItemSub.HSourceBillType);
- HWei = ClsPub.isStrNull(oItemSub.HEndQty);
- string sql = "insert into Gy_BarCodeBill (HInterID,HBarCode,HBarCodeType,HMaterID,HUnitID,HQty,HKFDate,HKFPeriod,HKFDQDate" +
- ",HBatchNo,HSupID,HGroupID,HMaker,HMakeDate,HPrintQty,HEndQty,HSupflag" +
- ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HMTONO " +
- ") values ("
- + linterid.ToString() + ",'" + HBarCode + "','" + HBarCodeType + "'," + HMaterID + "," + HUnitID + "," + HQty2 + ",'" + HKFDate + "'," + HKFPeriod + ",'" + HKFDQDate
- + "','" + HBatchNo + "'," + HSupID + "," + HGroupID + ",'" + ClsPub.CurUserName + "','" + DateTime.Today + "'," + HPrintQty + ",'" + HWei + "',1"
- + "," + HSourceInterID + "," + HSourceEntryID + ",'" + HSourceBillNo + "','" + HSourceBillType + "','" + HMTONO + "')";
oCn.RunProc(sql);
}
}
--
Gitblit v1.9.1