From f1c107b1ae5f48f2c18c23568bf902c410b564f5 Mon Sep 17 00:00:00 2001
From: zrg <z1873@LAPTOP-EAVL132E>
Date: 星期一, 01 十二月 2025 13:11:50 +0800
Subject: [PATCH] 优化凯贝桌面端批量下推有的字段没有存入值,优化app条码拆码,增加app条码拆码获取打印数据

---
 WebAPI/Controllers/仓存管理/条码生成/Sc_BarCodeController.cs |   60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 58 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 01cff2b..d8bf4c3 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"
@@ -2658,7 +2658,7 @@
                     string sql = "insert into Gy_BarCodeBill (HInterID, HEntryID, HBarCode, HBarCodeType, HBarCodeSubType, HMaterID, HUnitID, HQty, HBatchNo, HSupID, HGroupID, HMaker, HMakeDate, " +
                   "HPrintQty, HSourceInterID, HSourceEntryID, HSourceBillNo, HSourceBillType, HinitQty, HEndQty, HBarcodeQtys, HBarcodeNo, HDeptID, HWhID, HSPID, HRemark, " +
                   "HCusID, HCusType, HEndDate, HWorkLineName, HBarCodeDate, HSTOCKORGID, HOWNERID, HSeOrderBillNo, HGiveAwayFlag, HMaterName, HMaterModel, " +
-                  "HPinfan, HAuxPropID, HMTONo, HInnerBillNo, HCoilNO, HFurnaceNO, HFactory, HAuxQty, HheatNO, HProduceDate, HExpiryDate, HEmpID, HCusModel, HCusMaterName, HCheckEmpName, HZZRQ" +
+                  "HPinfan, HAuxPropID, HMTONo, HInnerBillNo, HCoilNO, HFurnaceNO, HFactory, HAuxQty, HheatNO, HProduceDate, HExpiryDate, HEmpID, HCusModel, HCusMaterName, HCheckEmpName, HZZRQ,HSupMaterNumber,HSupBatchNo" +
                   ") values (" +
                   "'" + ds.Tables[0].Rows[0]["HInterID"].ToString() + "', " +
                   "'" + (int.Parse(ds.Tables[0].Rows[0]["HEntryID"].ToString()) + 1).ToString() + "', " +
@@ -2711,7 +2711,9 @@
                   "'" + ds.Tables[0].Rows[0]["HCusModel"].ToString() + "', " +
                   "'" + ds.Tables[0].Rows[0]["HCusMaterName"].ToString() + "', " +
                   "'" + ds.Tables[0].Rows[0]["HCheckEmpName"].ToString() + "', " +
-                  "'" + ds.Tables[0].Rows[0]["HZZRQ"].ToString() + "'" +
+                  "'" + ds.Tables[0].Rows[0]["HZZRQ"].ToString() + "', " +
+                  "'" + ds.Tables[0].Rows[0]["HSupBatchNo"].ToString() + "', " +
+                  "'" + ds.Tables[0].Rows[0]["HSupMaterNumber"].ToString() + "'" +
                   ")";
                     //鎻掑叆鎷嗗垎鏉$爜
                     oCN.RunProc(sql);
@@ -2750,6 +2752,60 @@
         }
         #endregion
 
+        #region [app 鏉$爜鎷嗙爜鑾峰彇鎷嗙爜鎵撳嵃鏁版嵁]
+        [Route("Sc_BarCode/GetSplitBarCode_SubList")]
+        [HttpGet]
+        public object GetSplitBarCode_SubList(string HBarCodeNo)
+        {
+            try
+            {
+                if (string.IsNullOrWhiteSpace(HBarCodeNo))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "璇疯緭鍏ユ潯鐮佺紪鍙�";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }                
+
+                SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+
+
+                var sql = "select * from h_v_Gy_BarCodeBillList_APP where 鏉$爜缂栧彿='"+ HBarCodeNo + "'";
+
+                DataSet ds = oCn.RunProcReturn(sql, "h_v_Gy_BarCodeBillList_APP");
+
+                //鍒ゆ柇鏉$爜鏄惁瀛樺湪鏉$爜妗f
+                if (ds.Tables[0].Rows.Count > 0)
+                {
+                    objJsonResult.code = "1";
+                    objJsonResult.count = 1;
+                    objJsonResult.Message = "[0000-1-037]鏌ヨ鎴愬姛";
+                    objJsonResult.data = ds.Tables[0];
+                    return objJsonResult;
+                }
+                else
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "[0000-1-010]娌℃湁杩斿洖浠讳綍璁板綍锛佸綋鍓嶆潯鐮佷笉瀛樺湪鏉$爜妗f";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+
+                return objJsonResult;
+            }
+            catch (Exception ex)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "寮傚父锛�" + ex.Message;
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+        #endregion
+
         #region [鏉$爜鐢熸垚鎺ュ彛_灏忓崼闀洉鐮乚
         [Route("Sc_BarCode/SaveSNByICMO_XW")]
         [HttpGet]

--
Gitblit v1.9.1