From e1937ea7d68c72e61095538d5fec4e7d795f78c9 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期四, 16 十月 2025 10:48:18 +0800
Subject: [PATCH] 修改物料管理显示和编辑
---
HTML/views/BaseSetting/Materials.html | 10 --
HTML/views/BaseSetting/MaterialsForm.html | 177 ++++++++++++++++++++++++++------------------
Wms/WMS.BLL/SysServer/MaterialsServer.cs | 9 +
Wms/Model/InterFaceModel/HttpModel.cs | 1
Wms/Wms/Controllers/BasisController.cs | 5
Wms/WMS.IBLL/ISysServer/IMaterialsServer.cs | 2
6 files changed, 117 insertions(+), 87 deletions(-)
diff --git a/HTML/views/BaseSetting/Materials.html b/HTML/views/BaseSetting/Materials.html
index b329135..e371a08 100644
--- a/HTML/views/BaseSetting/Materials.html
+++ b/HTML/views/BaseSetting/Materials.html
@@ -339,15 +339,7 @@
{
title: '鎿嶄綔', fixed: 'right', align: 'center', toolbar: '#table-content-list', width: 170
}
- ]],parseData: function(res) { // 鏁版嵁瑙ｆ瀽鍥炶皟
- console.log('鍘熷杩斿洖鏁版嵁:', res);
- return {
- "code": res.code, // 瑙ｆ瀽鎺ュ彛鐘舵��
- "msg": res.msg, // 瑙ｆ瀽鎻愮ず鏂囨湰
- "count": res.count, // 瑙ｆ瀽鏁版嵁闀垮害
- "data": res.data // 瑙ｆ瀽鏁版嵁鍒楄〃
- };
- },
+ ]]
});
}
diff --git a/HTML/views/BaseSetting/MaterialsForm.html b/HTML/views/BaseSetting/MaterialsForm.html
index 3c61be9..1ce4191 100644
--- a/HTML/views/BaseSetting/MaterialsForm.html
+++ b/HTML/views/BaseSetting/MaterialsForm.html
@@ -295,88 +295,121 @@
// }
// });
+
+ getPackagList();
var sel2 = false;
- //鑾峰彇鍖呰涓嬫媺鑿滃崟 PackagNo
- synData(IP + "/Basis/GetPackagList", {}, 'get', function (res) {
- if (res.code == 0) //鎴愬姛
- {
- for (var i = 0; i < res.data.length; i++) {
- $("#PackagNo").append('<option value =' + res.data[i].PackagNo + '>' + res.data[i].PackagName + '</option>');
+ function getPackagList(){
+ var packagList=[];
+ for (let index = 1; index < 5; index++) {
+ //鑾峰彇鍖呰涓嬫媺鑿滃崟 PackagNo
+ synData(IP + "/Basis/GetPackagList?page="+index, {}, 'get', function (res) {
+ if (res.code == 0) {
+ if(res.data.length>0){
+ packagList.push(res.data)
+ }else{
+ return;
+ }
+
+ }else {
+ return;
+ }
+
+ });
+ }
+ if(packagList.length>0){
+ for (var i = 0; i < packagList.length; i++) {
+ var itemList=packagList[i];
+ for(var j = 0; j < itemList.length; j++){
+ $("#PackagNo").append('<option value =' + itemList[j].PackagNo + '>' + itemList[j].PackagName + '</option>');
+ }
}
form.render('select');
sel2 = true;
}
- else //涓嶆垚鍔�
- {
- layer.msg(res.msg, {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function () { sel2 = true; });
+
+ var id = getQueryString('id');
+ if (!id) {
+ id = 0;
+ $("#AuditStatusNo").attr("disabled", "true")
}
-
- });
-
- var id = getQueryString('id');
- if (!id) {
- id = 0;
- $("#AuditStatusNo").attr("disabled", "true")
- }
- else {
- if (sel1 && sel2 && sel3) {
- var param = {
- UserId: id,
- };
- synData(IP + "/Basis/GetMateById?Id= " + getQueryString('id') + "", {}, 'get', function (res) {
- if (res.code == 0) //鎴愬姛
- {
- // console.log(res.data.CategoryNo)
- //瀹℃壒鐘舵�佺紪杈戞樉绀�
- if (res.data.AuditStatusNo != "") {
- //$('#Auditishow').show();
- // $('#IsControlledshow').show();
- // $('#IsInspectshow').show();
+ else {
+ if (sel1 && sel2 && sel3) {
+ var param = {
+ UserId: id,
+ };
+ synData(IP + "/Basis/GetMateById?Id= " + getQueryString('id') + "", {}, 'get', function (res) {
+ if (res.code == 0) //鎴愬姛
+ {
+ // console.log(res.data.CategoryNo)
+ //瀹℃壒鐘舵�佺紪杈戞樉绀�
+ if (res.data.AuditStatusNo != "") {
+ //$('#Auditishow').show();
+ // $('#IsControlledshow').show();
+ // $('#IsInspectshow').show();
+ }
+ //鐗╂枡鍙�
+ if (res.data.SkuNo != "") {
+ $("input[name='SkuNo']").attr("disabled", "disabled")
+ }
+ //椤甸潰璧嬪��
+ $("input[name='SkuNo']").val(res.data.SkuNo); // 鐗╂枡鍙�
+ $("input[name='SkuName']").val(res.data.SkuName); // 鐗╂枡鍚嶇О
+ $("input[name='Standard']").val(res.data.Standard); // 瑙勬牸
+ $("#AuditStatusNo option[value='" + res.data.AuditStatusNo + "']").attr("selected", "selected"); // 瀹℃牳鐘舵��
+ $("#Type option[value='" + res.data.Type + "']").attr("selected", "selected"); // 绫诲瀷
+ $("#CategoryNo option[value='" + res.data.CategoryNo + "']").attr("selected", "selected"); // 绫诲埆
+ // $("#CategoryNo option[value='" + res.data.CategoryNo + "']").attr("selected","selected"); // 绫诲埆
+ $("#IsControlled option[value='" + res.data.IsControlled + "']").attr("selected", "selected"); // 鏄惁鍙楁帶
+ $("#IsInspect option[value='" + res.data.IsInspect + "']").attr("selected", "selected"); // 鏄惁鍏嶆
+ $("#IsPasteCode option[value='" + res.data.IsPasteCode + "']").attr("selected", "selected"); // 鏄惁璐存爣
+ $("input[name='UnitNo']").val(res.data.UnitNo);
+ $("#PackagNo option[value='" + res.data.PackagNo + "']").attr("selected", "selected"); // 鍖呰
+ // $("#PackagNo").attr("disabled", "disabled")
+ $("#Environment option[value='" + res.data.Environment + "']").attr("selected", "selected"); // 瀛樺偍鐜
+ $("input[name='Weight']").val(res.data.Weight); // 鐞嗚閲嶉噺
+ $("input[name='Warranty']").val(res.data.Warranty); // 淇濊川鏈�
+ $("input[name='UnpackWarranty']").val(res.data.UnpackWarranty); // 淇濊川鏈�
+ $("input[name='Price']").val(res.data.Price); // 鐞嗚鍗曚环
+ $("input[name='AdventTime']").val(res.data.AdventTime); // 涓存湡
+ $("input[name='LowInventory']").val(res.data.LowInventory); // 浣庡簱瀛�
+ $("textarea[name='Demo']").val(res.data.Demo); //澶囨敞
+ form.render();
+ form.render('select');
}
- //鐗╂枡鍙�
- if (res.data.SkuNo != "") {
- $("input[name='SkuNo']").attr("disabled", "disabled")
+ else //涓嶆垚鍔�
+ {
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () { });
}
- //椤甸潰璧嬪��
- $("input[name='SkuNo']").val(res.data.SkuNo); // 鐗╂枡鍙�
- $("input[name='SkuName']").val(res.data.SkuName); // 鐗╂枡鍚嶇О
- $("input[name='Standard']").val(res.data.Standard); // 瑙勬牸
- $("#AuditStatusNo option[value='" + res.data.AuditStatusNo + "']").attr("selected", "selected"); // 瀹℃牳鐘舵��
- $("#Type option[value='" + res.data.Type + "']").attr("selected", "selected"); // 绫诲瀷
- $("#CategoryNo option[value='" + res.data.CategoryNo + "']").attr("selected", "selected"); // 绫诲埆
- // $("#CategoryNo option[value='" + res.data.CategoryNo + "']").attr("selected","selected"); // 绫诲埆
- $("#IsControlled option[value='" + res.data.IsControlled + "']").attr("selected", "selected"); // 鏄惁鍙楁帶
- $("#IsInspect option[value='" + res.data.IsInspect + "']").attr("selected", "selected"); // 鏄惁鍏嶆
- $("#IsPasteCode option[value='" + res.data.IsPasteCode + "']").attr("selected", "selected"); // 鏄惁璐存爣
- $("input[name='UnitNo']").val(res.data.UnitNo);
- $("#PackagNo option[value='" + res.data.PackagNo + "']").attr("selected", "selected"); // 鍖呰
- // $("#PackagNo").attr("disabled", "disabled")
- $("#Environment option[value='" + res.data.Environment + "']").attr("selected", "selected"); // 瀛樺偍鐜
- $("input[name='Weight']").val(res.data.Weight); // 鐞嗚閲嶉噺
- $("input[name='Warranty']").val(res.data.Warranty); // 淇濊川鏈�
- $("input[name='UnpackWarranty']").val(res.data.UnpackWarranty); // 淇濊川鏈�
- $("input[name='Price']").val(res.data.Price); // 鐞嗚鍗曚环
- $("input[name='AdventTime']").val(res.data.AdventTime); // 涓存湡
- $("input[name='LowInventory']").val(res.data.LowInventory); // 浣庡簱瀛�
- $("textarea[name='Demo']").val(res.data.Demo); //澶囨敞
- form.render();
- form.render('select');
- }
- else //涓嶆垚鍔�
- {
- layer.msg(res.msg, {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function () { });
- }
- });
+ });
+ }
+
}
-
+ form.render('select');
}
- form.render('select');
+ //鑾峰彇鍖呰涓嬫媺鑿滃崟 PackagNo
+ // synData(IP + "/Basis/GetPackagList", {}, 'get', function (res) {
+ // if (res.code == 0) //鎴愬姛
+ // {
+ // for (var i = 0; i < res.data.length; i++) {
+ // $("#PackagNo").append('<option value =' + res.data[i].PackagNo + '>' + res.data[i].PackagName + '</option>');
+ // }
+ // form.render('select');
+ // sel2 = true;
+ // }
+ // else //涓嶆垚鍔�
+ // {
+ // layer.msg(res.msg, {
+ // icon: 2,
+ // time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ // }, function () { sel2 = true; });
+ // }
+
+ // });
+
+
});
//鑾峰彇娴忚鍣ㄥ弬鏁�
diff --git a/Wms/Model/InterFaceModel/HttpModel.cs b/Wms/Model/InterFaceModel/HttpModel.cs
index 2f931b9..b6f6180 100644
--- a/Wms/Model/InterFaceModel/HttpModel.cs
+++ b/Wms/Model/InterFaceModel/HttpModel.cs
@@ -698,6 +698,7 @@
/// 鍦板潃
/// </summary>
public string Address { get; set; }
+ public string streetAddress { get; set; }
/// <summary>
/// 鑱旂郴浜�
/// </summary>
diff --git a/Wms/WMS.BLL/SysServer/MaterialsServer.cs b/Wms/WMS.BLL/SysServer/MaterialsServer.cs
index aaa6ff4..74ec721 100644
--- a/Wms/WMS.BLL/SysServer/MaterialsServer.cs
+++ b/Wms/WMS.BLL/SysServer/MaterialsServer.cs
@@ -61,7 +61,7 @@
{
Expression<Func<SysMaterials, bool>> item = Expressionable.Create<SysMaterials>()
.AndIF(!string.IsNullOrWhiteSpace(model.SkuNo), it => it.SkuNo.Contains(model.SkuNo.Trim()))
- .AndIF(!string.IsNullOrWhiteSpace(model.SkuName), it => it.SkuNo.Contains(model.SkuName.Trim()))
+ .AndIF(!string.IsNullOrWhiteSpace(model.SkuName), it => it.SkuName.Contains(model.SkuName.Trim()))
.AndIF(!string.IsNullOrWhiteSpace(model.AuditStatusNo), it => it.AuditStatusNo == model.AuditStatusNo)
.AndIF(!string.IsNullOrWhiteSpace(model.Type), it => it.Type == model.Type)
.AndIF(!string.IsNullOrWhiteSpace(model.IsControlled), it => it.IsControlled == model.IsControlled)
@@ -80,6 +80,7 @@
.LeftJoin<SysMaterialCategory>((a, b, c, d) => a.CategoryNo == d.CategoryNo && d.IsDel == "0")
.Select((a, b, c, d) => new MaterialsDto()
{
+ Id = a.Id,
SkuNo = a.SkuNo,
SkuName = a.SkuName,
Standard = a.Standard,
@@ -226,9 +227,11 @@
/// 鑾峰彇鍖呰淇℃伅鍒楄〃
/// </summary>
/// <returns></returns>
- public async Task<List<SysPackag>> GetPackagList()
+ public async Task<List<SysPackag>> GetPackagList(int page)
{
- return await Db.Queryable<SysPackag>().Where(s => s.IsDel == "0").ToListAsync();
+ int pageSize = 3000;
+ int skipCount = pageSize * (page - 1);
+ return await Db.Queryable<SysPackag>().Where(s => s.IsDel == "0").Skip(skipCount).Take(pageSize).ToListAsync();
}
#endregion
diff --git a/Wms/WMS.IBLL/ISysServer/IMaterialsServer.cs b/Wms/WMS.IBLL/ISysServer/IMaterialsServer.cs
index 8fb7165..eb6f1e7 100644
--- a/Wms/WMS.IBLL/ISysServer/IMaterialsServer.cs
+++ b/Wms/WMS.IBLL/ISysServer/IMaterialsServer.cs
@@ -83,7 +83,7 @@
/// 鑾峰彇鍖呰淇℃伅鍒楄〃
/// </summary>
/// <returns></returns>
- Task<List<SysPackag>> GetPackagList();
+ Task<List<SysPackag>> GetPackagList(int page);
#endregion
diff --git a/Wms/Wms/Controllers/BasisController.cs b/Wms/Wms/Controllers/BasisController.cs
index efd7527..4ecab44 100644
--- a/Wms/Wms/Controllers/BasisController.cs
+++ b/Wms/Wms/Controllers/BasisController.cs
@@ -717,9 +717,10 @@
/// </summary>
/// <returns></returns>
[HttpGet]
- public async Task<List<SysPackag>> GetPackagList()
+ public async Task<List<SysPackag>> GetPackagList(int page)
{
- return await _mate.GetPackagList();
+ var data = await _mate.GetPackagList(page);
+ return data;
}
#endregion
--
Gitblit v1.8.0