From 179a5764f06f36e8d0901d5c1b8ac85804920db9 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期四, 21 十一月 2024 16:54:24 +0800
Subject: [PATCH] 1

---
 WebAPI/Controllers/仓存管理/条码生成/Sc_BarCodeController.cs |   21 +++++++++++++++++++--
 1 files changed, 19 insertions(+), 2 deletions(-)

diff --git "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Sc_BarCodeController.cs" "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Sc_BarCodeController.cs"
index d66e65e..7875f1c 100644
--- "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Sc_BarCodeController.cs"
+++ "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Sc_BarCodeController.cs"
@@ -127,6 +127,10 @@
                     list.Add("浠櫒鎴愬搧鏉$爜瑙勫垯");
                     list.Add("璇曞墏鎴愬搧鏉$爜瑙勫垯");
                 }
+                else if (sCapName == "娣诲悍绉戞妧")
+                {
+                    list.Add("鎵规鏉$爜");
+                }
                 else
                 {
                     list.Add("鍞竴鏉$爜");
@@ -835,6 +839,7 @@
             long HEmpID = 0;
             string HCusModel = ""; //瀹㈡埛鐗╂枡瑙勬牸
             string HCusMaterName = ""; //瀹㈡埛鐗╂枡鍚嶇О
+            string HCheckEmpName = ""; //妫�楠屽憳鍚嶇О
 
             DataSet Ds;
             msg2 = msg2.Replace("\\", "");
@@ -858,6 +863,7 @@
                     HEmpID = ClsPub.isLong(ordrlist[j].HEmpID);
                     HCusModel = ClsPub.isStrNull(ordrlist[j].HCusModel);
                     HCusMaterName = ClsPub.isStrNull(ordrlist[j].HCusMaterName);
+                    HCheckEmpName = ClsPub.isStrNull(ordrlist[j].HCheckEmpName);
                     //鏃ユ湡鑾峰彇鏂瑰紡
                     sDate = DateTime.Now.ToString();
                     //
@@ -870,6 +876,10 @@
                         sDate = DBUtility.ClsPub.isStrNull(ordrlist[j].HEndDate);
                     }
                     else if (CampanyName == "澶忓疂鐢靛櫒")// 鏃ユ湡锛氱敓浜ц鍗� 鏉$爜鏃ユ湡
+                    {
+                        sDate = DBUtility.ClsPub.isStrNull(ordrlist[j].HDate);
+                    }
+                    else if (CampanyName == "涔濊彵")// 鏃ユ湡锛氱敓浜ц鍗� 鏉$爜鏃ユ湡
                     {
                         sDate = DBUtility.ClsPub.isStrNull(ordrlist[j].HDate);
                     }
@@ -1209,6 +1219,7 @@
                         barcode.HEmpID2 = ordrlist[j].HEmpID;
                         barcode.HCusModel2 = ordrlist[j].HCusModel;
                         barcode.HCusMaterName2 = ordrlist[j].HCusMaterName;
+                        barcode.HCheckEmpName2 = ordrlist[j].HCheckEmpName;
                         ListRows.Add(barcode);
                         k = k + 1;
                         n = n + 1;
@@ -1260,6 +1271,7 @@
             long HEmpID2 = 0;
             string HCusModel2 = "";
             string HCusMaterName2 = "";
+            string HCheckEmpName2 = "";
 
             try
             {
@@ -1275,6 +1287,10 @@
                         if (CampanyName == "鍗氭棩绉戞妧" || CampanyName == "澶忓疂鐢靛櫒")
                         {
                             HBarCodeType = "鍞竴鏉$爜";
+                        }
+                        if (CampanyName == "涔濊彵")
+                        {
+                            HBarCode = HBarCode + ClsPub.isStrNull(ListRows[i].HMTONo2);
                         }
                         //
                         HMaterID = ClsPub.isLong(ListRows[i].HMaterID2);
@@ -1317,6 +1333,7 @@
                         HEmpID2 = ClsPub.isLong(ListRows[i].HEmpID2);
                         HCusModel2 = ClsPub.isStrNull(ListRows[i].HCusModel2);
                         HCusMaterName2 = ClsPub.isStrNull(ListRows[i].HCusMaterName2);
+                        HCheckEmpName2 = ClsPub.isStrNull(ListRows[i].HCheckEmpName2);
                         oCN.RunProc("insert into Gy_BarCodeBill (HBarCode,HBarCodeType,HMaterID,HUnitID,HQty" +
                                     ",HBatchNo,HSupID,HGroupID,HMaker,HMakeDate,HPrintQty,HinitQty" +
                                     ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HEndQty " +
@@ -1325,7 +1342,7 @@
                                     ",HSTOCKORGID,HOWNERID,HSeOrderBillNo,HInterID,HEntryID " +
                                     ",HGiveAwayFlag " +
                                     ",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo" +
-                                    ",HCoilNO,HFurnaceNO,HFactory,HAuxQty,HheatNO,HProduceDate,HExpiryDate,HEmpID,HCusModel,HCusMaterName " +
+                                    ",HCoilNO,HFurnaceNO,HFactory,HAuxQty,HheatNO,HProduceDate,HExpiryDate,HEmpID,HCusModel,HCusMaterName,HCheckEmpName " +
                                     ") values ("
                                     + "'" + HBarCode + "','" + HBarCodeType + "'," + HMaterID.ToString() + "," + HUnitID.ToString() + "," + HQty2.ToString()
                                     + ",'" + HBatchNo2 + "'," + HSupID.ToString() + "," + HGroupID2.ToString() + ",'" + ClsPub.CurUserName + "',getdate()," + HPrintQty.ToString() + "," + HQty2.ToString()
@@ -1334,7 +1351,7 @@
                                     + ", " + HCusID.ToString() + ",'" + HCusType + "','" + HEndDate.ToShortDateString() + "','" + HWorkLineName + "','" + sDate + "'"
                                     + ", " + HOrgID.ToString() + "," + HOrgID.ToString() + ",'" + HSeOrderBillNo + "'," + HInterID.ToString() + "," + HEntryID.ToString() + ""
                                     + ", " + DBUtility.ClsPub.BoolToString(HGiveAwayFlag)
-                                    + ",'" + HMaterName + "','" + HMaterModel + "','" + HPinfan + "'," + HAuxPropID.ToString() + ",'" + HMTONo + "','" + HInnerBillNo + "','" + HCoilNO2 + "','" + HFurnaceNO2 + "','" + HFactory2 + "'," + HAuxQty2 + ",'" + HheatNO2 + "','" + HProduceDate + "','" + HExpiryDate + "'," + HEmpID2.ToString() + ",'" + HCusModel2 + "','" + HCusMaterName2 + "'" + ")");
+                                    + ",'" + HMaterName + "','" + HMaterModel + "','" + HPinfan + "'," + HAuxPropID.ToString() + ",'" + HMTONo + "','" + HInnerBillNo + "','" + HCoilNO2 + "','" + HFurnaceNO2 + "','" + HFactory2 + "'," + HAuxQty2 + ",'" + HheatNO2 + "','" + HProduceDate + "','" + HExpiryDate + "'," + HEmpID2.ToString() + ",'" + HCusModel2 + "','" + HCusMaterName2 + "','" + HCheckEmpName2 + "'" + ")");
 
 
                         //HNumber = ClsPub.isStrNull(grdSub.Rows[i].Cells[HMaterID2Col].Value);

--
Gitblit v1.9.1