From 6466b730bca8bd0fce990a48508c021e487de990 Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期四, 07 八月 2025 16:52:01 +0800
Subject: [PATCH] 条码生成模块返回源单调用方法中，增加根据客户海诚返回客户编号、款号、分组
---
WebAPI/Controllers/仓存管理/条码生成/Sc_BarCodeController.cs | 24 ++++++++++++++++++++++--
1 files changed, 22 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 d7abb7d..9709b67 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"
@@ -595,7 +595,13 @@
}
if (HSourceBillType == "閲囪喘璁㈠崟")
{
- ordrlist.HSourceBillSEQ = dt.Rows[i]["HSEQ"].ToString();
+ 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();
+ }
}
}
if (HSourceBillType == "閫�璐ч�氱煡鍗�")
@@ -629,7 +635,7 @@
//鏍规嵁TABLE鍐欏叆鐣岄潰(鍑哄叆搴撳崟鎹�)
private object Sub_WriteInForm_InOut(DataTable dt, HSouceOrderList ordrlist, string HBarCodeType, string HSourceBillType)
{
-
+ oSystemParameter.ShowBill(ref DBUtility.ClsPub.sExeReturnInfo);
for (int i = 0; i < dt.Rows.Count; i++)
{
ordrlist.HQty = dt.Rows[i]["鍙敓鎴愭潯鐮佹暟閲�"].ToString();
@@ -662,6 +668,20 @@
ordrlist.HMTONo = dt.Rows[i]["璁″垝璺熻釜鍙�"].ToString();
ordrlist.HDate = dt.Rows[i]["鏃ユ湡"].ToString();
ordrlist.HShowDate = DateTime.Now.ToString();
+
+ if (HSourceBillType == "閲囪喘鍏ュ簱鍗�")
+ {
+ 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.HFactory = dt.Rows[i]["瀹㈡埛缂栧彿"].ToString();
+ ordrlist.HCoilNO = dt.Rows[i]["娆惧彿"].ToString();
+ ordrlist.HFurnaceNO = dt.Rows[i]["鍒嗙粍"].ToString();
+ }
+ }
}
return ordrlist;
}
--
Gitblit v1.9.1