From 5286b614c84f8f82f81772cdb32c2dc5a0d26e0f Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期五, 28 十一月 2025 16:59:20 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/生产管理/生产任务单/Sc_ICMOBillController.cs | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diff --git "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillController.cs" "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillController.cs"
index 065afaa..fa12351 100644
--- "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillController.cs"
+++ "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillController.cs"
@@ -1279,12 +1279,7 @@
lsmain.HPicNumAssemble = ds.Tables[0].Rows[0]["鎬昏鍥惧彿"].ToString();
lsmain.HMaterTexture = ds.Tables[0].Rows[0]["鏉愯川"].ToString();
lsmain.HProductNum = ds.Tables[0].Rows[0]["鎴愬搧缂栧彿"].ToString();
- lsmain.HVerNum = ds.Tables[0].Rows[0]["鐗堟湰"].ToString();
- //lsmain.HCusNumber = ds.Tables[0].Rows[0]["婧愬崟瀹㈡埛缂栫爜"].ToString();
- //lsmain.HPickLabel = ds.Tables[0].Rows[0]["鍖呰鏍囪瘑"].ToString();
- //lsmain.HPickLabelNumber = ds.Tables[0].Rows[0]["鍖呰鏍囪瘑缂栫爜"].ToString();
- //lsmain.HXTNumber = ds.Tables[0].Rows[0]["鑺綋鐗╂枡浠ｇ爜"].ToString();
- //lsmain.HXTModel = ds.Tables[0].Rows[0]["鑺綋瑙勬牸鍨嬪彿"].ToString();
+ lsmain.HVerNum = ds.Tables[0].Rows[0]["鐗堟湰"].ToString();
lsmain.HWidth = double.Parse(ds.Tables[0].Rows[0]["HWidth"].ToString());
lsmain.HWeight = double.Parse(ds.Tables[0].Rows[0]["HWeight"].ToString());
lsmain.HAuxUnit = int.Parse(ds.Tables[0].Rows[0]["HAuxUnit"].ToString());
@@ -1316,6 +1311,8 @@
ClsSc_ProcessExchangeBillSub sub = new ClsSc_ProcessExchangeBillSub();
sub.HEntryID = j + 1;
sub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
+ sub.HRoutingBillMainID = long.Parse(row["hmainid"].ToString());
+ sub.HRoutingBillEntryID = long.Parse(row["hsubid"].ToString());
sub.HProcNo = long.Parse(row["宸ュ簭鍙�"].ToString());
sub.HProcID = long.Parse(row["HProcID"].ToString());
sub.HProcNumber = row["宸ュ簭浠ｇ爜"].ToString();
@@ -1354,7 +1351,7 @@
}
else
{
- oBill.omodel.HBillNo = DBUtility.ClsPub.CreateBillCode("3772", ref DBUtility.ClsPub.sExeReturnInfo,true);
+ oBill.omodel.HBillNo = DBUtility.ClsPub.CreateBillCode_Prod("3772", ref DBUtility.ClsPub.sExeReturnInfo,true);
bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
oBill.DetailColl.Clear();
--
Gitblit v1.9.1