From 7fe73fec1f10f151aaf31cc1ade7b4ed5126c3d5 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期四, 23 十月 2025 14:24:47 +0800
Subject: [PATCH] 修改物料管理选择包装因数据量大不显示问题；根据客户需求修改添加入库单校验生产日期规则；
---
Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs | 8 ++++----
HTML/views/ASNSetting/ArrivalNotice.html | 2 +-
HTML/views/BaseSetting/MaterialsForm.html | 19 ++++++++++---------
Wms/WMS.BLL/SysServer/MaterialsServer.cs | 5 ++---
Wms/Wms/Controllers/BasisController.cs | 4 ++--
5 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/HTML/views/ASNSetting/ArrivalNotice.html b/HTML/views/ASNSetting/ArrivalNotice.html
index a0462ac..0643f15 100644
--- a/HTML/views/ASNSetting/ArrivalNotice.html
+++ b/HTML/views/ASNSetting/ArrivalNotice.html
@@ -175,7 +175,7 @@
<script type="text/html" id="toolbarDemo1">
{{# function GetBtn1(d){
var html = '';
- if (d.Status == '0' && (d.Origin == '褰曞叆' || d.Origin == '閲囪喘鍗�')) {
+ if (d.Status == '0' && (d.Origin == '褰曞叆' || d.Origin == '瀵煎叆' || d.Origin == '閲囪喘鍗�')) {
html += `<a class="layui-btn layui-btn-normal layui-btn-xs editClass" lay-event="edit">
<i class="layui-icon layui-icon-edit"></i>缂栬緫</a>`;
}
diff --git a/HTML/views/BaseSetting/MaterialsForm.html b/HTML/views/BaseSetting/MaterialsForm.html
index 1ce4191..30c44e7 100644
--- a/HTML/views/BaseSetting/MaterialsForm.html
+++ b/HTML/views/BaseSetting/MaterialsForm.html
@@ -300,20 +300,21 @@
var sel2 = false;
function getPackagList(){
var packagList=[];
- for (let index = 1; index < 5; index++) {
- //鑾峰彇鍖呰涓嬫媺鑿滃崟 PackagNo
- synData(IP + "/Basis/GetPackagList?page="+index, {}, 'get', function (res) {
+
+ let shouldContinue = true;
+ let index = 1;
+ while (shouldContinue) {
+ synData(IP + "/Basis/GetPackagList?page="+index, {}, 'get', function (res, status, error) {
if (res.code == 0) {
if(res.data.length>0){
- packagList.push(res.data)
+ packagList.push(res.data);
+ index++;
}else{
- return;
- }
-
+ shouldContinue=false;
+ }
}else {
- return;
+ shouldContinue=false;
}
-
});
}
if(packagList.length>0){
diff --git a/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs b/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
index cadc2e7..8c1bab7 100644
--- a/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
+++ b/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
@@ -410,18 +410,18 @@
}
string lot1 = detailModel.Lot1;
string lot2 = detailModel.Lot2;
- if (sku.IsInspect == "0")//鏄惁鍏嶆锛�0锛氬惁 1锛氭槸
+ if (sku.IsControlled == "0")//鏄惁璇烽獙锛�0锛氭槸 1锛氬惁
{
- //涓嶅厤妫�鐗╂枡 鐢熶骇鏃ユ湡銆佹湁鏁堟湡涓嶈兘涓虹┖
+ //闇�瑕佽楠岀墿鏂� 鐢熶骇鏃ユ湡銆佹湁鏁堟湡涓嶈兘涓虹┖
DateTime lot12;
DateTime lot22;
if (!DateTime.TryParse(detailModel.Lot1, out lot12))
{
- throw new Exception("涓嶅厤妫�鐗╂枡鐢熶骇鏃ユ湡杞崲澶辫触");
+ throw new Exception("闇�瑕佽楠岀墿鏂欑敓浜ф棩鏈熻浆鎹㈠け璐�");
}
if (!DateTime.TryParse(detailModel.Lot2, out lot22))
{
- throw new Exception("涓嶅厤妫�鐗╂枡杩囨湡鏃ユ湡杞崲澶辫触");
+ throw new Exception("闇�瑕佽楠屾枡杩囨湡鏃ユ湡杞崲澶辫触");
}
lot1 = lot12.ToString("yyyy-MM-dd");
lot2 = lot22.ToString("yyyy-MM-dd");
diff --git a/Wms/WMS.BLL/SysServer/MaterialsServer.cs b/Wms/WMS.BLL/SysServer/MaterialsServer.cs
index 74ec721..d7dd7f6 100644
--- a/Wms/WMS.BLL/SysServer/MaterialsServer.cs
+++ b/Wms/WMS.BLL/SysServer/MaterialsServer.cs
@@ -229,9 +229,8 @@
/// <returns></returns>
public async Task<List<SysPackag>> GetPackagList(int page)
{
- int pageSize = 3000;
- int skipCount = pageSize * (page - 1);
- return await Db.Queryable<SysPackag>().Where(s => s.IsDel == "0").Skip(skipCount).Take(pageSize).ToListAsync();
+ int pageSize = 1000;
+ return await Db.Queryable<SysPackag>().Where(s => s.IsDel == "0").ToPageListAsync(page, pageSize);
}
#endregion
diff --git a/Wms/Wms/Controllers/BasisController.cs b/Wms/Wms/Controllers/BasisController.cs
index 4ecab44..79971ff 100644
--- a/Wms/Wms/Controllers/BasisController.cs
+++ b/Wms/Wms/Controllers/BasisController.cs
@@ -717,10 +717,10 @@
/// </summary>
/// <returns></returns>
[HttpGet]
- public async Task<List<SysPackag>> GetPackagList(int page)
+ public async Task<IActionResult> GetPackagList(int page)
{
var data = await _mate.GetPackagList(page);
- return data;
+ return Ok(new { code = 0, count = data.Count, msg = "鐗╂枡淇℃伅", data = data });
}
#endregion
--
Gitblit v1.8.0