From f3ad850c3ae72b8b76b2e1074eb51a71e86e8a40 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期五, 07 二月 2025 10:36:27 +0800
Subject: [PATCH] 安瑞条码内容错误修复；送货单编辑功能；送货单审核同步信息到金蝶时获取数据方式改为存储过程获取；夏宝修改连接金蝶表方式
---
WebAPI/DLL/DAL.dll | 0
WebAPI/DLL/Model.dll | 0
WebAPI/Controllers/BarCodeController.cs | 18 +++++++++++++++++-
3 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/WebAPI/Controllers/BarCodeController.cs b/WebAPI/Controllers/BarCodeController.cs
index 731daac..b17ad08 100644
--- a/WebAPI/Controllers/BarCodeController.cs
+++ b/WebAPI/Controllers/BarCodeController.cs
@@ -1873,7 +1873,23 @@
TM2 = "0" + TM2;
}
bar2.HMaterID = oItemSub2.HMaterID;
- bar2.HBarCode = oItemSub2.HBarCode.Replace(HBarcodeQty.ToString(), HWXQty.ToString());
+
+ var HBarCode_NX = oItemSub2.HBarCode.Split('@'); //鍐呯鎷嗗垎鏉＄爜缂栧彿
+ string HBarMaterNumber_NX = HBarCode_NX[0];//鍐呯鏉＄爜_鐗╂枡浠ｇ爜
+ string HBarMaterName_NX = HBarCode_NX[1];//鍐呯鏉＄爜_鐗╂枡鍚嶇О
+ string HBarMaterModel_NX = HBarCode_NX[2];//鍐呯鏉＄爜_鐗╂枡瑙勬牸鍨嬪彿
+ string HBarKFDate_NX = HBarCode_NX[3];//鍐呯鏉＄爜_鐢熶骇鏃ユ湡
+ string HBarQty_NX = HBarCode_NX[4];//鍐呯鏉＄爜_鏁伴噺
+ string HBarKFDQDate_NX = HBarCode_NX[5];//鍐呯鏉＄爜_鏈夋晥鏈熻嚦
+ string HBarBatchNo_NX = HBarCode_NX[6];//鍐呯鏉＄爜_鎵瑰彿
+ string HBarSupName_NX = HBarCode_NX[7];//鍐呯鏉＄爜_渚涘簲鍟嗗悕绉�
+ string HBarSourceBillNo_NX = HBarCode_NX[8];//鍐呯鏉＄爜_婧愬崟鍗曞彿
+
+ HBarQty_NX = HWXQty.ToString();
+
+ string TM_NX = $"{HBarMaterNumber_NX}@{HBarMaterName_NX}@{HBarMaterModel_NX}@{HBarKFDate_NX}@{HBarQty_NX}@{HBarKFDQDate_NX}@{HBarBatchNo_NX.TrimStart().TrimEnd()}@{HBarSupName_NX}@{HBarSourceBillNo_NX}";
+
+ bar2.HBarCode = TM_NX;//oItemSub2.HBarCode.Replace(HBarcodeQty.ToString(), HWXQty.ToString());//闂鎵�鍦� 澶栫鍖呰鏁帮紝鏇挎崲鎴愬唴绠卞寘瑁呮暟
bar2.HUnitID = oItemSub2.HUnitID;
bar2.HQty = HWXQty;
bar2.HBatchNo = DBUtility.ClsPub.isStrNull(oItemSub2.HBatchNo);
diff --git a/WebAPI/DLL/DAL.dll b/WebAPI/DLL/DAL.dll
index 258f1a0..7abab81 100644
--- a/WebAPI/DLL/DAL.dll
+++ b/WebAPI/DLL/DAL.dll
Binary files differ
diff --git a/WebAPI/DLL/Model.dll b/WebAPI/DLL/Model.dll
index 4278da6..8009133 100644
--- a/WebAPI/DLL/Model.dll
+++ b/WebAPI/DLL/Model.dll
Binary files differ
--
Gitblit v1.9.1