From 8f6b41bbf338fc89d8908cc94a76b5cb52c29d67 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 21 一月 2025 09:29:40 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/仓存管理/条码生成/Sc_BarCodeController.cs | 24 ++++++++++++++++++++++++
1 files changed, 24 insertions(+), 0 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 2207f87..81390b2 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"
@@ -237,6 +237,11 @@
count = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_ProcessExchangeBillList_Source " + sWhere + " order by 鍗曟嵁鍙� desc,hsubid", tabname).Tables[0].Rows.Count;
sql = string.Format(@"select top " + pageSize + " * from(select row_number() over (order by 鍗曟嵁鍙� desc,hsubid) as HRowNumber,* from h_v_IF_ProcessExchangeBillList_Source " + sWhere + ") as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
break;
+ case "閿�鍞嚭搴撳崟":
+ tabname = "h_v_IF_SellOutBillList_Source";
+ count = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_SellOutBillList_Source " + sWhere + " order by 鍗曟嵁鍙� desc,hsubid", tabname).Tables[0].Rows.Count;
+ sql = string.Format(@"select top " + pageSize + " * from(select row_number() over (order by 鍗曟嵁鍙� desc,hsubid) as HRowNumber,* from h_v_IF_SellOutBillList_Source " + sWhere + ") as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
+ break;
default:
break;
}
@@ -350,6 +355,12 @@
case "3711": //鐢熶骇姹囨姤鍗�
//寰楀埌淇℃伅
ds = oCN.RunProcReturn("select * from h_v_IF_ICMOReportList where hmainid=" + oSelectRow.BillMainID + " and hsubid=" + oSelectRow.BillSubID, "h_v_IF_ICMOReportList");
+ //鍐欏叆淇℃伅
+ ListRows.Add(HSourceOrderList1(ds.Tables[0], ordrlist, HBarCodeType, HSourceBillType));
+ break;
+ case "1205": //閿�鍞嚭搴撳崟
+ //寰楀埌淇℃伅
+ ds = oCN.RunProcReturn("select * from h_v_IF_SellOutBillList_BarCode where hmainid=" + oSelectRow.BillMainID + " and hsubid=" + oSelectRow.BillSubID, "h_v_IF_SellOutBillList_BarCode");
//鍐欏叆淇℃伅
ListRows.Add(HSourceOrderList1(ds.Tables[0], ordrlist, HBarCodeType, HSourceBillType));
break;
@@ -581,6 +592,15 @@
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();
+ 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;
@@ -1288,6 +1308,10 @@
{
HBarCodeType = "鍞竴鏉＄爜";
}
+ if (CampanyName == "涔濊彵")
+ {
+ HBarCode = HBarCode + ClsPub.isStrNull(ListRows[i].HMTONo2);
+ }
//
HMaterID = ClsPub.isLong(ListRows[i].HMaterID2);
HEntryID = ClsPub.isLong(ListRows[i].HEntryID2);
--
Gitblit v1.9.1