From 45c6eeb0a8ef6d0c9f23f3e08a97222d0a8276e1 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期一, 08 十二月 2025 10:31:49 +0800
Subject: [PATCH] 1

---
 WebAPI/Controllers/仓存管理/条码生成/Sc_BarCodeController.cs |    9 +++++++--
 1 files changed, 7 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 d8bf4c3..5a75f94 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"
@@ -560,12 +560,17 @@
 
                 if(HSourceBillType == "鏀舵枡閫氱煡鍗�")
                 {
-                    if (oSystemParameter.omodel.WMS_CampanyName != "鐟炰笌绁�")
+                    if (oSystemParameter.omodel.WMS_CampanyName.Contains("鍥涚淮灏�"))
+                    {
+
+                    }
+                    else if (oSystemParameter.omodel.WMS_CampanyName != "鐟炰笌绁�")
                     {
                         ordrlist.HFurnaceNO = dt.Rows[i]["鐐夊彿"].ToString();
                         ordrlist.HCoilNO = dt.Rows[i]["閽㈠嵎鎹嗗寘鍙�"].ToString();
                         ordrlist.HheatNO = dt.Rows[i]["鐑鐞�"].ToString();
                     }
+                    
                 }
 
                 if (HBarCodeType == "浠櫒澶栬喘浠舵潯鐮佸鍣ㄨ鍒�")
@@ -776,9 +781,9 @@
                 string CampanyName = sArray[4].ToString()=="xxx"?"": sArray[4].ToString();
                 string UserName = sArray[5].ToString();
                 ClsPub.CurUserName = UserName;
-
                 //鑾峰彇鍐呯爜
                 HInterID = DBUtility.ClsPub.CreateBillID_Prod(ModName, ref DBUtility.ClsPub.sExeReturnInfo);
+                
                 DAL.ClsGy_ORGANIZATIONS_View oClsGy_ORGANIZATIONS_View = new DAL.ClsGy_ORGANIZATIONS_View();
                 HOrgNumber = "";
                 if (oClsGy_ORGANIZATIONS_View.GetInfoByName(HOrgType))

--
Gitblit v1.9.1