From 7364add5b6c9af6294e1b28f4ec85a3739d71cd1 Mon Sep 17 00:00:00 2001
From: yxj <1qaz@123>
Date: 星期二, 31 五月 2022 14:25:22 +0800
Subject: [PATCH] 条码生成模块,生成条码增加存入字段HInitSourceEntryID

---
 WebAPI/Controllers/生产管理/生产任务单/Sc_ICMOBillController.cs |   24 ++++++++++++++++++++----
 1 files changed, 20 insertions(+), 4 deletions(-)

diff --git "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillController.cs" "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillController.cs"
index 9529dd2..3cf012e 100644
--- "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillController.cs"
+++ "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillController.cs"
@@ -173,14 +173,17 @@
             var _value = msg["msg"].ToString();
             string msg1 = _value.ToString();
             string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
-            string msg2 = sArray[0].ToString();
-            string msg3 = sArray[1].ToString();
-            string msg5 = sArray[2].ToString();
+            string msg2 = sArray[0].ToString();//琛ㄦ牸鏁版嵁
+            string msg3 = sArray[1].ToString();//鐧诲綍浜�
+            string msg5 = sArray[2].ToString();//鐧诲綍缁勭粐
+            string msg6 = sArray[3].ToString();//鏍囪
+            string msg7 = sArray[4].ToString();//褰撳墠鐢ㄦ枡娓呭崟
 
             ListModels oListModels = new ListModels();
             DataSet ds = new DataSet();
             ds = oCN.RunProcReturn("select * from Xt_ORGANIZATIONS where HItemID=" + msg5, "Xt_ORGANIZATIONS");
             string OrgNum = ds.Tables[0].Rows[0]["HNumber"].ToString();//缁勭粐浠g爜
+            DataSet d = oCN.RunProcReturn("select HRemark from Sc_PPBomBillMain where HBillNo='" + msg7 + "'", "Sc_ICMOBillMain");//鏌ユ壘璇ョ敤鏂欐竻鍗曚笂娆$敓鎴愮殑绠卞彿(HRemark瀛樻斁绠卞彿)
             DataSet Ds1 = new DataSet();
             try
             {
@@ -206,6 +209,8 @@
                 int LSH;
                 string LSH2;
                 string TM = "";
+                int XH = Convert.ToInt32(d.Tables[0].Rows[0]["HRemark"].ToString() == ""? 0 : Convert.ToInt32(d.Tables[0].Rows[0]["HRemark"].ToString()));
+
                 foreach (Models.ClsQK_PackingBill oItemSub in ls)
                 {
                     //鏍规嵁鐢熸垚鏉℃暟鐢熸垚鐩稿簲鏁伴噺鏉$爜
@@ -222,6 +227,16 @@
                             LSH2 = "0" + LSH2;
                         }
                         TM = sTMNumber + LSH2;
+
+                        if (msg6 == "ZZ")
+                        {
+                            XH = XH +1;
+                        }
+                        else if (msg6 == "PZ"&& ls.IndexOf(oItemSub) == 0)
+                        {
+                            XH = XH + 1;
+                        }
+
                         //鑾峰彇鍐呯爜
                         oCN.RunProc("insert into Gy_BarCodeBill (HEntryID,HBarCode,HBarCodeType,HMaterID,HUnitID,HQty" +
                                     ",HBatchNo,HSupID,HGroupID,HMaker,HMakeDate,HPrintQty,HinitQty" +
@@ -235,7 +250,7 @@
                                     + ",'" + TM + "','鍞竴鏉$爜'," + oItemSub.HMaterID.ToString() + "," + oItemSub.HUnitID.ToString() + "," + oItemSub.HMinQty.ToString()
                                     + ",'',0,0,'" + msg3 + "',getdate(),0," + oItemSub.HMinQty.ToString()
                                     + ", " + oItemSub.HInterID.ToString() + "," + oItemSub.HEntryID.ToString() + ",'" + oItemSub.HBillNo + "','3710',''"
-                                    + ",1,1," + oItemSub.HDeptID.ToString() + ",0,0,'"+ (int.Parse(oItemSub.HXH.ToString())+i) + "'"
+                                    + ",1,1," + oItemSub.HDeptID.ToString() + ",0,0,'"+ XH + "'"
                                     + ", " + oItemSub.HCusID.ToString() + ",'',getdate(),'',getdate()"
                                     + ", " + msg5.ToString() + "," + OrgNum.ToString() + ",'" + oItemSub.HSeOrderBillNo.ToString() + "'," + HInterID.ToString()
                                     + ",0"
@@ -245,6 +260,7 @@
                         
                     }
                     oCN.RunProc("update Sc_ICMOBillSub set HQty=" + oItemSub.HSpsQty  + " where HEntryID=" + oItemSub.HEntryID);
+                    oCN.RunProc("update Sc_PPBomBillMain set HRemark=" +XH+ " where HBillNo='" + msg7+"'");
                     DataSet Dsn = oCN.RunProcReturn("select top " + oItemSub.HTotalQty + " HItemID from Gy_BarCodeBill order by HItemID desc", "Gy_BarCodeBill");    //鑾峰彇鏈�澶ф祦姘村彿
                     for (int i = 0; i < oItemSub.HTotalQty; i++)
                     {

--
Gitblit v1.9.1