From 9f70464629f261ea1fb8a51e6cdca4b8ac66ff46 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期三, 13 八月 2025 10:01:45 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/仓存管理/条码生成/Sc_BarCodeController.cs | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 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 5bbada2..cfedc0c 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"
@@ -593,14 +593,14 @@
ordrlist.HGiveAwayFlag = 0;
}
}
- if (HSourceBillType == "閲囪喘璁㈠崟聧聲")
+ if (HSourceBillType == "鏀舵枡閫氱煡鍗�" || HSourceBillType == "閲囪喘璁㈠崟")
{
- if (oSystemParameter.omodel.WMS_CampanyName == "娴疯瘹職") //绯荤粺鍙傛暟 瀹㈡埛瀹氬埗鍖栧悕绉� 绌虹櫧涓洪�氱敤
+ if (oSystemParameter.omodel.WMS_CampanyName == "娴疯瘹") //绯荤粺鍙傛暟 瀹㈡埛瀹氬埗鍖栧悕绉� 绌虹櫧涓洪�氱敤
{
ordrlist.HSourceBillSEQ = dt.Rows[i]["HSEQ"].ToString();
ordrlist.HFactory = dt.Rows[i]["瀹㈡埛缂栧彿"].ToString();
ordrlist.HCoilNO = dt.Rows[i]["娆惧彿"].ToString();
- ordrlist.HFurnaceNO = dt.Rows[i]["鍒嗙粍聞"].ToString();
+ ordrlist.HFurnaceNO = dt.Rows[i]["鍒嗙粍"].ToString();
}
}
}
@@ -669,17 +669,17 @@
ordrlist.HDate = dt.Rows[i]["鏃ユ湡"].ToString();
ordrlist.HShowDate = DateTime.Now.ToString();
- if (HSourceBillType == "閲囪喘鍏ュ簱鍗�")
+ if(HSourceBillType=="閲囪喘鍏ュ簱鍗�")
{
- if (oSystemParameter.omodel.WMS_CampanyName == "娴疯瘹職") //绯荤粺鍙傛暟 瀹㈡埛瀹氬埗鍖栧悕绉� 绌虹櫧涓洪�氱敤
+ if(oSystemParameter.omodel.WMS_CampanyName=="娴疯瘹") //绯荤粺鍙傛暟 瀹㈡埛瀹氬埗鍖栧悕绉� 绌虹櫧涓洪�氱敤
{
ordrlist.HInnerBillNo = dt.Rows[i]["閲囪喘璁㈠崟鍙�"].ToString();
ordrlist.HSupID = dt.Rows[i]["HSupID"].ToString();
- ordrlist.HSupNumber = dt.Rows[i]["渚涘簲鍟嗕唬鐮伮�"].ToString();
- ordrlist.HSupName = dt.Rows[i]["渚涘簲鍟喡暵�"].ToString();
+ ordrlist.HSupNumber = dt.Rows[i]["渚涘簲鍟嗕唬鐮�"].ToString();
+ ordrlist.HSupName = dt.Rows[i]["渚涘簲鍟�"].ToString();
ordrlist.HFactory = dt.Rows[i]["瀹㈡埛缂栧彿"].ToString();
ordrlist.HCoilNO = dt.Rows[i]["娆惧彿"].ToString();
- ordrlist.HFurnaceNO = dt.Rows[i]["鍒嗙粍聞"].ToString();
+ ordrlist.HFurnaceNO = dt.Rows[i]["鍒嗙粍"].ToString();
}
}
}
@@ -1219,12 +1219,14 @@
string sHMTONo = ""; //璁″垝璺熻釜鍙�
string sHSourceBillNo = ""; //婧愬崟鍗曞彿
string sHSourceBillSEQ = ""; //婧愬崟琛屽彿
+ string sHSourceEntryID = ""; //婧愬崟瀛怚D
string sSupNumber = ""; //渚涘簲鍟嗕唬鐮�
string sHQty = ""; //鏁伴噺
sHMTONo = DBUtility.ClsPub.isStrNull(ordrlist[j].HMTONo);
sHSourceBillNo = DBUtility.ClsPub.isStrNull(ordrlist[j].HBillNo);
sHSourceBillSEQ = DBUtility.ClsPub.isStrNull(ordrlist[j].HSourceBillSEQ);
+ sHSourceEntryID = DBUtility.ClsPub.isStrNull(ordrlist[j].HSubID);
sSupNumber = DBUtility.ClsPub.isStrNull(ordrlist[j].HSupNumber);
sHQty = DBUtility.ClsPub.isStrNull(HMinQty);
@@ -1233,6 +1235,11 @@
//鏉＄爜瑙勫垯锛氶噰璐鍗曞崟鍙稝琛屽彿@鐗╂枡浠ｇ爜@MTO@鏁伴噺@渚涘簲鍟嗕唬鐮�
TM = sHSourceBillNo + "@" + sHSourceBillSEQ + "@" + HMaterNumber + "@" + sHMTONo + "@" + sHQty + "@" + sSupNumber;
}
+ else if (DBUtility.ClsPub.isStrNull(ordrlist[j].HBillType) == "1103") //婧愬崟锛氭敹鏂欓�氱煡鍗�
+ {
+ //鏉＄爜瑙勫垯锛氭敹鏂欓�氱煡鍗曞彿@鍗曟嵁瀛愬唴鐮丂鐗╂枡浠ｇ爜@MTO@鏁伴噺@渚涘簲鍟嗕唬鐮�
+ TM = sHSourceBillNo + "@" + sHSourceEntryID + "@" + HMaterNumber + "@" + sHMTONo + "@" + sHQty + "@" + sSupNumber;
+ }
else
{
//鏉＄爜瑙勫垯锛氱墿鏂欏唴鐮丂MTO@鏁伴噺
--
Gitblit v1.9.1