From 1a5256ee25e90967f9058061906643ab4142c434 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期二, 21 四月 2026 20:23:41 +0800
Subject: [PATCH] 1
---
WebAPI/Controllers/仓存管理/条码生成/Sc_BarCodeController.cs | 139 +++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 137 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 d423f0a..e8a110c 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"
@@ -535,9 +535,13 @@
break;
case "1103": //鏀舵枡閫氱煡鍗�
//寰楀埌淇℃伅
- ds = oCN.RunProcReturn("select * from h_v_IF_POInStockList where hmainid=" + oSelectRow.BillMainID + " and hsubid=" + oSelectRow.BillSubID, "h_v_IF_POInStockList");
+ // ds = oCN.RunProcReturn("select * from h_v_IF_POInStockList where hmainid=" + oSelectRow.BillMainID + " and hsubid=" + oSelectRow.BillSubID, "h_v_IF_POInStockList");
+ ds = oCN.RunProcReturn("select * from h_v_IF_POInStockBillList_Source where 鍙敓鎴愭潯鐮佹暟閲� > 0 and hmainid=" + oSelectRow.BillMainID + " and hsubid=" + oSelectRow.BillSubID, "h_v_IF_POInStockBillList_Source");
+
+
//鍐欏叆淇℃伅
- ListRows.Add(HSourceOrderList1(ds.Tables[0], ordrlist, HBarCodeType, HSourceBillType));
+ //ListRows.Add(HSourceOrderList1(ds.Tables[0], ordrlist, HBarCodeType, HSourceBillType));
+ ListRows.Add(HSourceOrderList2(ds.Tables[0], ordrlist, HBarCodeType, HSourceBillType));
break;
case "1601": //濮斿璁㈠崟
//寰楀埌淇℃伅
@@ -791,6 +795,135 @@
ordrlist.HSPName = dt.Rows[i]["浠撲綅"].ToString();
}
if(HSourceBillType == "閿�鍞嚭搴撳崟")
+ {
+ ordrlist.HWhID = dt.Rows[i]["HWhID"].ToString();
+ ordrlist.HWhNumber = dt.Rows[i]["浠撳簱浠ｇ爜"].ToString();
+ ordrlist.HWhName = dt.Rows[i]["浠撳簱"].ToString();
+ //ordrlist.HSPID = dt.Rows[i]["HSPID"].ToString();
+ //ordrlist.HSPNumber = dt.Rows[i]["浠撲綅浠ｇ爜"].ToString();
+ //ordrlist.HSPName = dt.Rows[i]["浠撲綅"].ToString();
+ }
+ }
+ return ordrlist;
+ }
+
+ public object HSourceOrderList2(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();
+ ordrlist.HMinQty = dt.Rows[i]["鍙敓鎴愭潯鐮佹暟閲�"].ToString();
+ ordrlist.HMainID = dt.Rows[i]["hmainid"].ToString();
+ ordrlist.HSubID = dt.Rows[i]["hsubid"].ToString();
+ ordrlist.HBillNo = dt.Rows[i]["鍗曟嵁鍙�"].ToString();
+ ordrlist.HBillType = dt.Rows[i]["HBillType"].ToString();
+ ordrlist.HDate = dt.Rows[i]["鏃ユ湡"].ToString(); //鍗氭棩 鏀舵枡鍗曟嵁鏃ユ湡
+ ordrlist.HShowDate = DateTime.Now.ToString();
+ ordrlist.HDeptID = dt.Rows[i]["HDeptID"].ToString();
+ ordrlist.HDeptNumber = dt.Rows[i]["閮ㄩ棬浠ｇ爜"].ToString();
+ ordrlist.HDeptName = dt.Rows[i]["閮ㄩ棬"].ToString();
+ ordrlist.HMaterID = dt.Rows[i]["HMaterID"].ToString();
+ ordrlist.HMaterNumber = dt.Rows[i]["鐗╂枡浠ｇ爜"].ToString();
+ ordrlist.HMaterName = dt.Rows[i]["鐗╂枡鍚嶇О"].ToString();
+ ordrlist.HMaterModel = dt.Rows[i]["瑙勬牸鍨嬪彿"].ToString();
+ ordrlist.HBatchNo = dt.Rows[i]["鎵瑰彿"].ToString();
+ ordrlist.HUnitID = dt.Rows[i]["HUnitID"].ToString();
+ // ordrlist.HUnitNumber = dt.Rows[i]["璁￠噺鍗曚綅浠ｇ爜"].ToString();
+ ordrlist.HUnitName = dt.Rows[i]["璁￠噺鍗曚綅"].ToString();
+ // ordrlist.HRemark = dt.Rows[i]["澶囨敞"].ToString();
+ ordrlist.HMTONo = dt.Rows[i]["璁″垝璺熻釜鍙�"].ToString();
+ ordrlist.HProduceDate = DBUtility.ClsPub.isDate(dt.Rows[i]["鐢熶骇鏃ユ湡"]);
+ ordrlist.HExpiryDate = DBUtility.ClsPub.isDate(dt.Rows[i]["鏈夋晥鏈熻嚦"]);
+ //ordrlist.HISKFPERIOD = int.Parse(dt.Rows[i]["HISKFPERIOD"].ToString());
+ //ordrlist.HISKFPERIOD = DBUtility.ClsPub.isInt(dt.Rows[i]["HISKFPERIOD"]);
+ //ordrlist.HEXPUNIT = dt.Rows[i]["HEXPUNIT"].ToString(); //鏈夋晥鏈熷崟浣�(鏃ャ�佹湀銆佸勾)
+ //ordrlist.HEXPPERIOD = double.Parse(dt.Rows[i]["HEXPPERIOD"].ToString()); //鏈夋晥鏈熷��
+
+
+ if (HSourceBillType == "鏀舵枡閫氱煡鍗�")
+ {
+ ordrlist.HAuxPropID = dt.Rows[i]["HAuxPropID"].ToString();
+ ordrlist.HAuxPropNumber = dt.Rows[i]["杈呭姪灞炴�т唬鐮�"].ToString();
+ ordrlist.HAuxPropName = dt.Rows[i]["杈呭姪灞炴��"].ToString();
+ ordrlist.HSourceBillNo = dt.Rows[i]["婧愬崟鍗曞彿"].ToString();
+ ordrlist.HSeOrderBillNo = dt.Rows[i]["閿�鍞鍗曞彿"].ToString();
+ ordrlist.HSeOrderSEQ = int.Parse(dt.Rows[i]["閿�鍞鍗曡鍙�"].ToString());
+ ordrlist.HReInspectionFlag = string.IsNullOrWhiteSpace(dt.Rows[i]["澶嶆鏍囪"].ToString()) ? false : true;
+ ordrlist.HInspectionCycle = int.Parse(dt.Rows[i]["澶嶆鍛ㄦ湡"].ToString());
+ ordrlist.HReInspectionDate = dt.Rows[i]["妫�楠屾棩鏈�"].ToString();
+ ordrlist.HSupID = dt.Rows[i]["HSupID"].ToString();
+ ordrlist.HSupName = dt.Rows[i]["渚涘簲鍟�"].ToString();
+ ordrlist.HSupNumber = dt.Rows[i]["渚涘簲鍟嗕唬鐮�"].ToString();
+ ordrlist.HPOOrderBillMTO = dt.Rows[i]["閲囪喘璺熻釜鍙�"].ToString();
+ if (oSystemParameter.omodel.WMS_CampanyName.Contains("鍥涚淮灏�"))
+ {
+
+ }
+ else if (oSystemParameter.omodel.WMS_CampanyName.Contains("閿﹂殕")){
+ ordrlist.JLHCusOrderBillNo = dt.Rows[i]["瀹㈡埛璁㈠崟鍙�"].ToString();
+ ordrlist.JLHProdModel = dt.Rows[i]["浜у搧鍨嬪彿"].ToString();
+ }
+ }
+
+ if (HBarCodeType == "浠櫒澶栬喘浠舵潯鐮佸鍣ㄨ鍒�")
+ {
+ ordrlist.HMinQty = dt.Rows[i]["鏈敓鎴愭潯鐮佹暟閲�"].ToString();
+ }
+ else if (HBarCodeType == "浠櫒澶栬喘浠舵潯鐮佹櫘閫氳鍒�")
+ {
+ ordrlist.HMinQty = "1";
+ }
+ else
+ {
+ // ordrlist.HMinQty = dt.Rows[i]["鏈�灏忓寘瑁呮暟"].ToString();
+ }
+ ordrlist.HMaker = ClsPub.CurUserName;
+ if (HSourceBillType == "鏀舵枡閫氱煡鍗�" || HSourceBillType == "閲囪喘璁㈠崟" || HSourceBillType == "濮斿璁㈠崟" || HSourceBillType == "閲囪喘鍏ュ簱鍗�")
+ {
+ ordrlist.HSupID = dt.Rows[i]["hsupid"].ToString();
+ ordrlist.HSupNumber = dt.Rows[i]["渚涘簲鍟嗕唬鐮�"].ToString();
+ ordrlist.HSupName = dt.Rows[i]["渚涘簲鍟�"].ToString();
+ if (HSourceBillType == "鏀舵枡閫氱煡鍗�")
+ {
+ if (dt.Rows[i]["鏄惁璧犲搧"].ToString() == "鏄�")
+ {
+ ordrlist.HGiveAwayFlag = 1;
+ }
+ else
+ {
+ ordrlist.HGiveAwayFlag = 0;
+ }
+ ordrlist.HSeOrderBillNo = dt.Rows[i]["閿�鍞鍗曞彿"].ToString();
+ ordrlist.HSeOrderSEQ = int.Parse(dt.Rows[i]["閿�鍞鍗曡鍙�"].ToString());
+ }
+ if (HSourceBillType == "鏀舵枡閫氱煡鍗�" || HSourceBillType == "閲囪喘璁㈠崟")
+ {
+ 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 == "閫�璐ч�氱煡鍗�")
+ {
+ ordrlist.HCusID = dt.Rows[i]["HCusID"].ToString();
+ ordrlist.HCusNumber = dt.Rows[i]["瀹㈡埛浠ｇ爜"].ToString();
+ ordrlist.HCusName = dt.Rows[i]["瀹㈡埛"].ToString();
+ }
+ if (HSourceBillType == "鍏朵粬鍏ュ簱鍗�" || HSourceBillType == "棰嗘枡鍑哄簱鍗�")
+ {
+ ordrlist.HWhID = dt.Rows[i]["HWhID"].ToString();
+ ordrlist.HWhNumber = dt.Rows[i]["浠撳簱浠ｇ爜"].ToString();
+ ordrlist.HWhName = dt.Rows[i]["浠撳簱"].ToString();
+ ordrlist.HSPID = dt.Rows[i]["HSPID"].ToString();
+ ordrlist.HSPNumber = dt.Rows[i]["浠撲綅浠ｇ爜"].ToString();
+ ordrlist.HSPName = dt.Rows[i]["浠撲綅"].ToString();
+ }
+ if (HSourceBillType == "閿�鍞嚭搴撳崟")
{
ordrlist.HWhID = dt.Rows[i]["HWhID"].ToString();
ordrlist.HWhNumber = dt.Rows[i]["浠撳簱浠ｇ爜"].ToString();
@@ -2813,6 +2946,8 @@
}
#endregion
+
+
#region[鏉＄爜鐢熸垚鏂规硶_閿﹂殕]
private object SaveBarCode_JinLong(string msg2, string HSelectBarCodeType, string CampanyName, string HSourceBillTypeName)
{
--
Gitblit v1.9.1