From 9b3790a8e5b45cdfa5a7ac9e0988340e2d43b776 Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期二, 23 十二月 2025 14:40:43 +0800
Subject: [PATCH] 组托小卫修复物料代码和id搞混，新增小卫条码规则（物料编码-供应商编码-来料批号-来料数量-采购订单编码）
---
WebAPI/Controllers/仓存管理/条码生成/Sc_BarCodeController.cs | 28 +++++++++++++++++++++-------
WebAPI/Controllers/CJGL/Cj_SingleStationController.cs | 3 ++-
WebAPI/Controllers/BaseSet/Gy_MaterialController.cs | 2 +-
3 files changed, 24 insertions(+), 9 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
index f6d5708..271740c 100644
--- a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
@@ -5103,7 +5103,7 @@
{
try
{
- ds = oCN.RunProcReturn($"select * from Gy_BarCodeBill where HBarCode='{HbarCode}' ", "Gy_Material");
+ ds = oCN.RunProcReturn($"select *,b.hname HMaterNumber from Gy_BarCodeBill a left join Gy_Material b on a.HMaterID=b.HItemID where HBarCode='{HbarCode}' ", "Gy_Material");
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
diff --git a/WebAPI/Controllers/CJGL/Cj_SingleStationController.cs b/WebAPI/Controllers/CJGL/Cj_SingleStationController.cs
index d028b41..bd7fe67 100644
--- a/WebAPI/Controllers/CJGL/Cj_SingleStationController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_SingleStationController.cs
@@ -3446,7 +3446,8 @@
if (sWhere == null || sWhere.Equals(""))
{
- ds = oCN.RunProcReturn("select * from h_v_Sc_UnbindStation_BarList order by 鏉＄爜鏃ユ湡 desc", "h_v_Sc_UnbindStation_BarList");
+ ds = oCN.RunProcReturn("select * from h_v_Sc_UnbindStation_BarList" +
+ " order by 鏉＄爜鏃ユ湡 desc", "h_v_Sc_UnbindStation_BarList");
}
else
{
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 7590cd2..b818d4d 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"
@@ -1058,7 +1058,6 @@
string HPOInStockBillNo = ""; // 鏀舵枡閫氱煡鍗曞彿
string HPOOrderBillNo = ""; // 閲囪喘璁㈠崟鍙�
-
DataSet Ds;
msg2 = msg2.Replace("\\", "");
msg2 = msg2.Replace("\n", ""); //\n
@@ -1069,6 +1068,7 @@
if (ClsPub.isLong(ordrlist[j].HMaterID) != 0)
{
HNumber = DBUtility.ClsPub.isStrNull(ordrlist[j].HMaterID);
+ HSupNumber = DBUtility.ClsPub.isStrNull(ordrlist[j].HSupNumber);//渚涘簲鍟�
HMaterNumber = DBUtility.ClsPub.isStrNull(ordrlist[j].HMaterNumber);
HBatchNo = ClsPub.isStrNull(ordrlist[j].HBatchNo);
@@ -1224,11 +1224,24 @@
}
else if (CampanyName.Contains("灏忓崼"))
{
- // 灏忓崼鐢靛櫒
- // 鏉＄爜鍓嶇紑 = 鍗曟嵁鍙� + 鐗╂枡缂栫爜 + 鎵规鍙�
- sTMNumber = HPOOrderBillNo + "@" + HMaterNumber + "@" + HBatchNo;
- Ds = oCN.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
- LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
+ if(HSourceBillTypeName== "閲囪喘璁㈠崟")
+ {
+
+ //鏉＄爜瑙勫垯涓猴細鐗╂枡缂栫爜-渚涘簲鍟嗙紪鐮�-鏉ユ枡鎵瑰彿-鏉ユ枡鏁伴噺-閲囪喘璁㈠崟缂栫爜
+ sTMNumber = HMaterNumber + "-" + HSupNumber + "-" + HBatchNo + "-" + HBQty + "-" + HPOInStockBillNo;
+
+ Ds = oCN.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
+ LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
+ }
+ else
+ {
+ // 灏忓崼鐢靛櫒
+ // 鏉＄爜鍓嶇紑 = 鍗曟嵁鍙� + 鐗╂枡缂栫爜 + 鎵规鍙�
+ sTMNumber = HPOOrderBillNo + "@" + HMaterNumber + "@" + HBatchNo;
+ Ds = oCN.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
+ LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
+ }
+
}
else //閫氱敤鏂规硶
{
@@ -1427,7 +1440,7 @@
TM = HNumber + "@" + sHMTONo.Replace(" ","") + "@" + HBatchNo.Replace(" ","") + "@" + sHQty;
}
}
-
+
barcode.HBarCode2 = TM;
barcode.HEntryID2 = ClsPub.isStrNull(j + 1);
barcode.HMaterID2 = ordrlist[j].HMaterID;
@@ -1568,6 +1581,7 @@
{
HBarCode = HBarCode + ClsPub.isStrNull(ListRows[i].HMTONo2);
}
+
//
HMaterID = ClsPub.isLong(ListRows[i].HMaterID2);
HEntryID = ClsPub.isLong(ListRows[i].HEntryID2);
--
Gitblit v1.9.1