From 0f2bdefca1bcfada65aafe33234e5e4d69522ce7 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期三, 25 九月 2024 09:45:12 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/BaseSet/Gy_MaterialController.cs | 2 +-
Model/车间管理/ClsSc_ProcessExchangeBillSub_BatchSplit.cs | 1 +
2 files changed, 2 insertions(+), 1 deletions(-)
diff --git "a/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBillSub_BatchSplit.cs" "b/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBillSub_BatchSplit.cs"
index c950ad8..f5b267e 100644
--- "a/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBillSub_BatchSplit.cs"
+++ "b/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBillSub_BatchSplit.cs"
@@ -20,6 +20,7 @@
public string HBillNo;//流转卡号
public string HBatchNo;//批次
public string HGroupNumber;//班组
+ public Int64 HWorkShopID;//生产车间内码
}
}
diff --git a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
index 103c5e3..f729bb2 100644
--- a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
@@ -1587,7 +1587,7 @@
return objJsonResult;
}
- string sql1 = "select top 5000 * from h_v_IF_BarCodeBillList where 1 = 1 ";
+ string sql1 = "select top 15000 * from h_v_IF_BarCodeBillList where 1 = 1 ";
string sql = sql1 + sWhere + " order by hmainid desc";
ds = oCN.RunProcReturn(sql, "h_v_IF_BarCodeBillList");
--
Gitblit v1.9.1