From f5eae388af5dd5a8a59bad22ef3e07dd5c452fe7 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期四, 22 六月 2023 03:14:23 +0800
Subject: [PATCH] 加载菜单、自定义菜单
---
WebAPI/Controllers/仓存管理/条码生成/Sc_BarCodeController.cs | 26 +++++++++++++++-----------
1 files changed, 15 insertions(+), 11 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 1e4977f..700941b 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"
@@ -132,7 +132,7 @@
list.Add("鍞竴鏉＄爜");
list.Add("鍝佺鏉＄爜");
list.Add("鎵规鏉＄爜");
- //list.Add("鎵樼洏鏉＄爜");
+ list.Add("鎵樼洏鏉＄爜");
}
objJsonResult.code = "1";
objJsonResult.count = 1;
@@ -177,27 +177,27 @@
case "鐢熶骇璁㈠崟":
tabname = "h_v_IFCLD_ICMOBillList_Source";
count = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IFCLD_ICMOBillList_Source "+sWhere+ " and 浠诲姟鏁伴噺>isnull(鍏ュ簱鏁伴噺,0) and 鐘舵��<>'缁撴' order by 鍗曟嵁鍙�", tabname).Tables[0].Rows.Count;
- sql = string.Format(@"select top " + pageSize + " * from(select row_number() over (order by 鍗曟嵁鍙�) as HRowNumber,* from h_v_IFCLD_ICMOBillList_Source " + sWhere + " and 浠诲姟鏁伴噺>isnull(鍏ュ簱鏁伴噺,0) and 鐘舵��<>'缁撴') as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
+ sql = string.Format(@"select * from(select row_number() over (order by 鍗曟嵁鍙�) as HRowNumber,* from h_v_IFCLD_ICMOBillList_Source " + sWhere + " and 浠诲姟鏁伴噺>isnull(鍏ュ簱鏁伴噺,0) and 鐘舵��<>'缁撴') as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
break;
case "鐢熶骇姹囨姤鍗�":
tabname = "h_v_IF_ICMOReportBillList_Source";
count = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_ICMOReportBillList_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_ICMOReportBillList_Source " + sWhere + ") as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
+ sql = string.Format(@"select * from(select row_number() over (order by 鍗曟嵁鍙� desc,hsubid) as HRowNumber,* from h_v_IF_ICMOReportBillList_Source " + sWhere + ") as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
break;
case "閲囪喘璁㈠崟":
tabname = "h_v_IF_POOrderBillList_Source";
count = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_POOrderBillList_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_POOrderBillList_Source " + sWhere + ") as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
+ sql = string.Format(@"select * from(select row_number() over (order by 鍗曟嵁鍙� desc,hsubid) as HRowNumber,* from h_v_IF_POOrderBillList_Source " + sWhere + ") as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
break;
case "鏀舵枡閫氱煡鍗�":
tabname = "h_v_IF_POInStockBillList_Source";
count = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_POInStockBillList_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_POInStockBillList_Source " + sWhere + ") as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
+ sql = string.Format(@"select * from(select row_number() over (order by 鍗曟嵁鍙� desc,hsubid) as HRowNumber,* from h_v_IF_POInStockBillList_Source " + sWhere + ") as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
break;
case "濮斿璁㈠崟":
tabname = "h_v_IF_EntrustOrderBillList_Source";
count = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_EntrustOrderBillList_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_EntrustOrderBillList_Source " + sWhere + ") as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
+ sql = string.Format(@"select * from(select row_number() over (order by 鍗曟嵁鍙� desc,hsubid) as HRowNumber,* from h_v_IF_EntrustOrderBillList_Source " + sWhere + ") as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
break;
case "鐢熶骇鍏ュ簱鍗�":
tabname = "h_v_IF_ProductInBillList_Source";
@@ -959,10 +959,14 @@
LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
LSHlen = 5;
}
- //else if (cmbHBarCodeType.Text == "鎵樼洏鏉＄爜")
- //{
- // TM = HOrgNumber + HNumber + LSH2;
- //}
+ else if (HSelectBarCodeType == "鎵樼洏鏉＄爜")
+ {
+ LSHlen = 4; //娴佹按鍙烽暱搴�
+ //鏉＄爜鍓嶇紑 = 鐗╂枡鍐呯爜 + 骞� + 鏈� + 鏃�
+ sTMNumber = 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
{
objJsonResult.code = "0";
@@ -1002,7 +1006,7 @@
{
LSH2 = "0" + LSH2;
}
- if (HSelectBarCodeType == "鍞竴鏉＄爜")
+ if (HSelectBarCodeType == "鍞竴鏉＄爜" || HSelectBarCodeType == "鎵樼洏鏉＄爜")
{
//鏉＄爜缂栧彿 = 鏉＄爜鍓嶇紑 + 娴佹按鍙�
TM = sTMNumber + LSH2;
--
Gitblit v1.9.1