From 552ac362ab031223b230d92352c40427d891a6aa Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期四, 03 八月 2023 10:20:43 +0800
Subject: [PATCH] 1
---
WebAPI/Controllers/仓存管理/条码生成/Sc_BarCodeController.cs | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 59 insertions(+), 1 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 2506f79..49a8420 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"
@@ -69,7 +69,7 @@
}
else
{
- list.Add("");
+ list.Add(CampanyName);
}
objJsonResult.code = "1";
objJsonResult.count = 1;
@@ -880,6 +880,64 @@
//oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
}
+ else if (CampanyName == "鐟炰笌绁�") {
+ var date = DateTime.Now.ToString("yyMMdd");//鏃ユ湡
+ if (HSourceBillTypeName == "鏀舵枡閫氱煡鍗�")
+ {
+ //鐗╂枡浠ｇ爜-鍖呰鏍囪瘑-鏃ユ湡-渚涘簲鍟嗕唬鐮�-鍏綅娴佹按鍙�
+ LSHlen = 8;//娴佹按鍙锋槸8浣�
+
+ DataSet dataDs = oCN.RunProcReturn($"select b.F_TEZV_BASE from AIS20220308151944..T_PUR_Receive a inner join AIS20220308151944..T_PUR_RECEIVEENTRY b on a.FID = b.FID where a.FID={ordrlist[j].HMainID} and b.FENTRYID={ordrlist[j].HSubID}", "T_PUR_Receive");
+ if (dataDs.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦紒";
+ return objJsonResult;
+ }
+
+ sTMNumber = ordrlist[j].HMaterNumber + "-" + dataDs.Tables[0].Rows[0]["F_TEZV_BASE"].ToString() + "-" + date + "-" + ordrlist[j].HSupNumber + "-";
+
+ //sTMNumber = ordrlist[j].HMaterNumber + "-鍖呰鏍囪瘑-" + date + "-" + ordrlist[j].HSupNumber + "-";
+ Ds = oCN.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
+ LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
+ }
+ else if (HSourceBillTypeName == "鐢熶骇鍏ュ簱鍗�")
+ {
+ //鐗╂枡浠ｇ爜-鍖呰鏍囪瘑-鏃ユ湡-缁勭粐浠ｇ爜-鍏綅娴佹按鍙�
+ LSHlen = 8;//娴佹按鍙锋槸8浣�
+
+ DataSet dataDs = oCN.RunProcReturn($"select b.F_bsv_Base1,a.FPRDORGID from AIS20220308151944..T_PRD_INSTOCK a inner join AIS20220308151944..T_PRD_INSTOCKENTRY b on a.FID = b.FID where a.FID={ordrlist[j].HMainID} and b.FENTRYID={ordrlist[j].HSubID}", "T_PRD_INSTOCK");
+ if (dataDs.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦紒";
+ return objJsonResult;
+ }
+ string RQHNumber = "";
+ if (dataDs.Tables[0].Rows[0]["FPRDORGID"].ToString() == "100014")//姹熻嫃
+ {
+ RQHNumber = "1.07.008";
+ }
+ else if (dataDs.Tables[0].Rows[0]["FPRDORGID"].ToString() == "100012")//涓婃捣
+ {
+ RQHNumber = "1.04.008";
+ }
+
+ sTMNumber = ordrlist[j].HMaterNumber + "-" + dataDs.Tables[0].Rows[0]["F_bsv_Base1"].ToString() + "-" + date + "-" + RQHNumber + "-";
+
+ //sTMNumber = ordrlist[j].HMaterNumber + "-鍖呰鏍囪瘑-"+ date + "-缁勭粐浠ｇ爜-";
+ Ds = oCN.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
+ LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
+ }
+ else
+ {
+ sTMNumber = HOrgNumber + HNumber + sYear + sPeriod + sDay;
+ Ds = oCN.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
+ LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
+ }
+ }
else //閫氱敤鏂规硶
{
//鏉＄爜鍓嶇紑 = 缁勭粐浠ｇ爜 + 鐗╂枡浠ｇ爜 + 骞� + 鏈� + 鏃�
--
Gitblit v1.9.1