From 89e44d60763512c3d9130542554c6d2d07d6269a Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期一, 24 七月 2023 08:56:46 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/仓存管理/条码生成/Sc_BarCodeController.cs | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 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 a788ec6..2506f79 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"
@@ -156,6 +156,7 @@
[HttpGet]
public object ReportFromBillList(int page, int limit, string sWhere,string HSouceBillType,string HOrgID)
{
+ oSystemParameter.ShowBill(ref DBUtility.ClsPub.sExeReturnInfo);
List<object> columnNameList = new List<object>();
try
{
@@ -191,8 +192,16 @@
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 * 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)");
+ if (oSystemParameter.omodel.WMS_CampanyName == "鐟炰笌绁�")
+ {
+ count = new SQLHelper.ClsCN().RunProcReturn("select top 1000 * from h_v_IF_POInStockBillList_Source " + sWhere + " order by 鍗曟嵁鍙� desc,hsubid", tabname).Tables[0].Rows.Count;
+ sql = string.Format(@"select * from(select top 1000 row_number() over (order by 鍗曟嵁鍙� desc,hsubid) as HRowNumber,* from h_v_IF_POInStockBillList_Source " + sWhere + ") as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
+ }
+ else
+ {
+ 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 * 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";
@@ -465,6 +474,7 @@
public object HSourceOrderList1(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();
@@ -491,9 +501,12 @@
if(HSourceBillType == "鏀舵枡閫氱煡鍗�")
{
- ordrlist.HFurnaceNO = dt.Rows[i]["鐐夊彿"].ToString();
- ordrlist.HCoilNO = dt.Rows[i]["閽㈠嵎鎹嗗寘鍙�"].ToString();
- ordrlist.HheatNO = dt.Rows[i]["鐑鐞�"].ToString();
+ if (oSystemParameter.omodel.WMS_CampanyName != "鐟炰笌绁�")
+ {
+ ordrlist.HFurnaceNO = dt.Rows[i]["鐐夊彿"].ToString();
+ ordrlist.HCoilNO = dt.Rows[i]["閽㈠嵎鎹嗗寘鍙�"].ToString();
+ ordrlist.HheatNO = dt.Rows[i]["鐑鐞�"].ToString();
+ }
}
if (HBarCodeType == "浠櫒澶栬喘浠舵潯鐮佸鍣ㄨ鍒�")
--
Gitblit v1.9.1