From 4acb88b7afaab5b18a1c9ca8a78ce346297c382f Mon Sep 17 00:00:00 2001
From: IPC-610 <IPC-610@DESKTOP-6LEOOS3>
Date: 星期四, 02 一月 2025 10:59:38 +0800
Subject: [PATCH] 修改问题
---
HTML/views/WareHouseSetting/AreaFrom.html | 1
Wms/WMS.BLL/DataServer/StockServer.cs | 8 +++
HTML/views/WareHouseSetting/Roadway.html | 1
HTML/views/WareHouseSetting/RoadwayFrom.html | 2 +
Wms/WMS.BLL/SysServer/StorageRoadwayServer.cs | 3 +
HTML/views/BaseSetting/Materials.html | 4 +-
HTML/views/WareHouseSetting/AreaAddFrom.html | 1
Wms/Model/ModelDto/DataDto/StockDetailDto.cs | 5 ++
HTML/views/StatisticalReport/InventoryStatistics.html | 48 ++++++++++++++++++++---
Wms/Wms/Controllers/StatisticalController.cs | 4 +-
HTML/views/BaseSetting/MaterialsForm.html | 4 +-
HTML/views/SystemSettings/CategoryForm.html | 10 ++--
HTML/views/SystemSettings/Category.html | 18 ++++----
HTML/views/WareHouseSetting/Area.html | 1
Wms/WMS.IBLL/IDataServer/IStockServer.cs | 2
Wms/Wms/Controllers/DownApiController.cs | 3 +
16 files changed, 85 insertions(+), 30 deletions(-)
diff --git a/HTML/views/BaseSetting/Materials.html b/HTML/views/BaseSetting/Materials.html
index 8f100aa..2e777d1 100644
--- a/HTML/views/BaseSetting/Materials.html
+++ b/HTML/views/BaseSetting/Materials.html
@@ -106,7 +106,7 @@
<div class="layui-inline">
<!-- 鐗╂枡绫诲埆 -->
<div class="layui-inline">
- <label class="layui-form-label" style="width: 60px;">鍖哄煙绫诲埆</label>
+ <label class="layui-form-label" style="width: 60px;">閫昏緫搴撳尯</label>
<div class="layui-input-inline">
<select name="CategoryNo" id="CategoryNo" lay-verify="">
<option value=""></option>
@@ -358,7 +358,7 @@
field: 'Environment', title: '瀛樺偍鐜', align: 'center', templet: '#buttonEnvironment', width: 120
},
{
- field: 'CategoryName', title: '鐗╂枡绫诲埆', align: 'center', width: 120
+ field: 'CategoryName', title: '閫昏緫搴撳尯', align: 'center', width: 120
},
{
field: 'Weight', title: '鐞嗚閲嶉噺', align: 'center', width: 135
diff --git a/HTML/views/BaseSetting/MaterialsForm.html b/HTML/views/BaseSetting/MaterialsForm.html
index a6666d1..e01ecc5 100644
--- a/HTML/views/BaseSetting/MaterialsForm.html
+++ b/HTML/views/BaseSetting/MaterialsForm.html
@@ -23,7 +23,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鐗╂枡绫诲埆</label>
+ <label class="layui-form-label">閫昏緫搴撳尯</label>
<div class="layui-input-block" style="width:182px">
<select name="CategoryNo" id="CategoryNo" lay-verify="required" lay-search>
<option value=""></option>
@@ -66,7 +66,7 @@
<div class="layui-input-block" style="width: 182px;">
<select name="Type" id="Type" lay-verify="" lay-verify="" lay-search>
<option value=""></option>
- <option value="0">鍘熸枡</option>
+ <option value="0">鍘熻緟鏂�</option>
<option value="1">鍖呮潗</option>
<option value="2">鎴愬搧</option>
<option value="3">鑰楁潗</option>
diff --git a/HTML/views/StatisticalReport/InventoryStatistics.html b/HTML/views/StatisticalReport/InventoryStatistics.html
index 7643476..35c5693 100644
--- a/HTML/views/StatisticalReport/InventoryStatistics.html
+++ b/HTML/views/StatisticalReport/InventoryStatistics.html
@@ -65,7 +65,7 @@
<div class="layui-input-inline">
<select name="Type" id="Type" lay-verify="" lay-verify="" lay-search>
<option value=""></option>
- <option value="0">鍘熸枡</option>
+ <option value="0">鍘熻緟鏂�</option>
<option value="1">鍖呮潗</option>
<option value="2">鎴愬搧</option>
<option value="3">鑰楁潗</option>
@@ -100,6 +100,14 @@
<label class="layui-form-label" style="width: 60px;">鎵�灞炲尯鍩�</label>
<div class="layui-input-inline">
<select name="AreaNo" id="AreaNo" lay-filter="getAreaNo" lay-search>
+ <option value=""></option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 60px;">閫昏緫搴撳尯</label>
+ <div class="layui-input-inline">
+ <select name="CategoryNo" id="CategoryNo" lay-filter="getCategoryNo" lay-search>
<option value=""></option>
</select>
</div>
@@ -429,7 +437,7 @@
]];
var DetailColsSysArr = encodeURIComponent(encodeURIComponent(JSON.stringify(DetailColsArr)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜
//#endregion
- function refreshTable2(SkuNo, SkuName, OwnerNo, OwnerName, LotNo, LocatNo, PalletNo, Status, InspectStatus, HouseNo, AreaNo, Type) {
+ function refreshTable2(SkuNo, SkuName, OwnerNo, OwnerName, LotNo, LocatNo, PalletNo, Status, InspectStatus, HouseNo, AreaNo,CategoryNo, Type) {
//#region 鑷畾涔夎〃澶�
var colsJson2
var param1 = {
@@ -472,6 +480,7 @@
InspectStatus: InspectStatus, //璐ㄦ鐘舵��
HouseNo: HouseNo,
AreaNo: AreaNo, // 鎵�灞炲尯鍩�
+ CategoryNo:CategoryNo, //閫昏緫搴撳尯
Type: Type,
};
sendData(IP + "/Statistical/GetInventoryList1", param, 'get', function (res) {
@@ -514,6 +523,7 @@
var InspectStatus = $("#InspectStatus").val();
var HouseNo = $("#WareHouseNo").val(); // 鎵�灞炰粨搴�
var AreaNo = $("#AreaNo").val(); // 鎵�灞炲尯鍩�
+ var CategoryNo =$("#CategoryNo").val();
var Type = $("#Type").val(); // 鐗╂枡绫诲瀷
if (yemianid == 0) {
@@ -522,9 +532,9 @@
} else if (yemianid == 1) {
quanSkuNo = '';
quanLotNo = '';
- console.log("鏄庣粏");
+ console.log("鏄庣粏33");
console.log(HouseNo);
- refreshTable2(SkuNo, SkuName, OwnerNo, OwnerName, LotNo, LocatNo, PalletNo, Status, InspectStatus, HouseNo, AreaNo, Type);
+ refreshTable2(SkuNo, SkuName, OwnerNo, OwnerName, LotNo, LocatNo, PalletNo, Status, InspectStatus, HouseNo, AreaNo,CategoryNo, Type);
}
});
@@ -554,6 +564,7 @@
var InspectStatus = $("#InspectStatus").val();
var HouseNo = $("#WareHouseNo").val(); // 鎵�灞炰粨搴�
var AreaNo = $("#AreaNo").val(); // 鎵�灞炲尯鍩�
+ var CategoryNo = $("#CategoryNo").val();
var Type = $("#Type").val(); // 鐗╂枡绫诲瀷
console.log(data.index);
yemianid = data.index
@@ -561,8 +572,8 @@
console.log("鎬诲崟");
refreshTable(SkuNo, SkuName, OwnerNo, OwnerName, LotNo);
} else if (yemianid == 1) {
- console.log("鏄庣粏");
- refreshTable2(SkuNo, SkuName, OwnerNo, OwnerName, LotNo, LocatNo, PalletNo, Status, InspectStatus, HouseNo, AreaNo, Type);
+ console.log("鏄庣粏11");
+ refreshTable2(SkuNo, SkuName, OwnerNo, OwnerName, LotNo, LocatNo, PalletNo, Status, InspectStatus, HouseNo, AreaNo,CategoryNo, Type);
}
});
@@ -594,7 +605,7 @@
}
});
} else if (yemianid == 1) {
- console.log("鏄庣粏");
+ console.log("鏄庣粏22");
var SkuNo = $("#SkuNo").val();
if (SkuNo == '') {
SkuNo = quanSkuNo;
@@ -727,6 +738,29 @@
}
});
+ //鑾峰彇閫昏緫搴撳尯涓嬫媺妗�
+ sendData(IP + "/Sys/GetMaterialCategories?wareHouseNo=" + val, {}, 'get', function (res) {
+ console.log("ret.data:"+res.data[4].CategoryNo)
+ console.log("code:"+res.code)
+ $("#CategoryNo").empty();
+ $("#CategoryNo").append('<option value =""></option>');
+ if (res.code == 1) { //鎴愬姛
+ for (var i = 0; i < res.data.length; i++) {
+ $("#CategoryNo").append('<option value =' + res.data[i].CategoryNo + '>' + res.data[i].CategoryNo + '-' +
+ res.data[i].CategoryName + '</option>');
+ }
+ form.render('select');
+ } else {
+ layer.msg('鑾峰彇鍖哄煙淇℃伅澶辫触', {
+ icon: 2,
+ time: 2000
+ }, function () {
+
+ form.render('select');
+ });
+ }
+ });
+
};
});
diff --git a/HTML/views/SystemSettings/Category.html b/HTML/views/SystemSettings/Category.html
index e4a110f..f0a2544 100644
--- a/HTML/views/SystemSettings/Category.html
+++ b/HTML/views/SystemSettings/Category.html
@@ -23,7 +23,7 @@
<div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC" id="top">
<div class="layui-form-item">
<div class="layui-inline">
- <label class="layui-form-label" style="width: 60px;">绫诲埆鍚嶇О</label>
+ <label class="layui-form-label" style="width: 60px;">搴撳尯鍚嶇О</label>
<div class="layui-input-inline">
<input type="text" id="CategoryName" name="CategoryName" placeholder="璇疯緭鍏ョ被鍒悕绉�" autocomplete="off" class="layui-input">
</div>
@@ -128,17 +128,17 @@
});
if (res.code == 0) { //鎴愬姛
for (var k = 0; k < res.data.length; k++) {
- if (res.data[k].MenuName == "鏂板绫诲埆") {
+ if (res.data[k].MenuName == "鏂板搴撳尯") {
$(function() {
$("#approvalBtn").show();
});
}
- if (res.data[k].MenuName == "鍒犻櫎绫诲埆") {
+ if (res.data[k].MenuName == "鍒犻櫎搴撳尯") {
$(function() {
$(".approvalBtndel").show();
});
}
- if (res.data[k].MenuName == "缂栬緫绫诲埆") {
+ if (res.data[k].MenuName == "缂栬緫搴撳尯") {
console.log(1)
$(function() {
$(".approvalBtnupt").show();
@@ -182,10 +182,10 @@
title: '搴忓彿', type: 'numbers', fixed: 'left', width:65
},
{
- field: 'CategoryNo', title: '绫诲埆缂栫爜', align: 'center', fixed: 'left',width:100
+ field: 'CategoryNo', title: '搴撳尯缂栫爜', align: 'center', fixed: 'left',width:100
},
{
- field: 'CategoryName', title: '绫诲埆鍚嶇О', align: 'center',width:100
+ field: 'CategoryName', title: '搴撳尯鍚嶇О', align: 'center',width:100
},
{
field: 'AreaName', title: '缁戝畾鍖哄煙', align: 'center'
@@ -234,7 +234,7 @@
add: function() {
layer.open({
type: 2,
- title: '娣诲姞绫诲埆淇℃伅',
+ title: '娣诲姞搴撳尯淇℃伅',
content: 'CategoryForm.html',
maxmin: true,
area: ['530px', '530px'],
@@ -326,7 +326,7 @@
//鍒犻櫎
if (obj.event === 'del')
{
- layer.confirm('纭畾鍒犻櫎閫変腑鐨勭被鍒紵', function(index) {
+ layer.confirm('纭畾鍒犻櫎閫変腑鐨勫簱鍖猴紵', function(index) {
cusid = data.Id;
console.log(cusid);
@@ -375,7 +375,7 @@
cusId = data.Id;
layer.open({
type: 2,
- title: '缂栬緫绫诲埆淇℃伅',
+ title: '缂栬緫搴撳尯淇℃伅',
content: 'CategoryForm.html?id=' + cusId,
maxmin: true,
area: ['530px', '530px'],
diff --git a/HTML/views/SystemSettings/CategoryForm.html b/HTML/views/SystemSettings/CategoryForm.html
index dbc6bcb..d65eeac 100644
--- a/HTML/views/SystemSettings/CategoryForm.html
+++ b/HTML/views/SystemSettings/CategoryForm.html
@@ -2,7 +2,7 @@
<html>
<head>
<meta charset="utf-8">
- <title>鐗╂枡绫诲埆淇℃伅缁存姢</title>
+ <title>閫昏緫搴撳尯淇℃伅缁存姢</title>
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
@@ -11,15 +11,15 @@
<body>
<div class="layui-form" lay-filter="layuiadmin-app-form-list" id="layuiadmin-app-form-list" style="padding: 20px 30px 0 0;">
<div class="layui-form-item">
- <label class="layui-form-label">绫诲埆缂栫爜</label>
+ <label class="layui-form-label">搴撳尯缂栫爜</label>
<div class="layui-input-block">
- <input type="text" name="CategoryNo" placeholder="璇疯緭鍏ョ被鍒紪鐮�" lay-verify="required" autocomplete="off" class="layui-input">
+ <input type="text" name="CategoryNo" placeholder="璇疯緭鍏ュ簱鍖虹紪鐮�" lay-verify="required" autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label">绫诲埆鍚嶇О</label>
+ <label class="layui-form-label">搴撳尯鍚嶇О</label>
<div class="layui-input-block">
- <input type="text" name="CategoryName" placeholder="璇疯緭鍏ョ被鍒悕绉�" lay-verify="required" autocomplete="off" class="layui-input">
+ <input type="text" name="CategoryName" placeholder="璇疯緭鍏ュ簱鍖哄悕绉�" lay-verify="required" autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-form-item" onchange="abc()">
diff --git a/HTML/views/WareHouseSetting/Area.html b/HTML/views/WareHouseSetting/Area.html
index 385bc4e..cca26c6 100644
--- a/HTML/views/WareHouseSetting/Area.html
+++ b/HTML/views/WareHouseSetting/Area.html
@@ -47,6 +47,7 @@
<option value="2">鍘熸枡鍖�</option>
<option value="3">鍖呮潗鍖�</option>
<option value="4">绌烘墭鍖�</option>
+ <option value="5">鑰楁潗鍖�</option>
</select>
</div>
</div>
diff --git a/HTML/views/WareHouseSetting/AreaAddFrom.html b/HTML/views/WareHouseSetting/AreaAddFrom.html
index 9c86606..5d52f99 100644
--- a/HTML/views/WareHouseSetting/AreaAddFrom.html
+++ b/HTML/views/WareHouseSetting/AreaAddFrom.html
@@ -61,6 +61,7 @@
<option value="2">鍘熸枡鍖�</option>
<option value="3">鍖呮潗鍖�</option>
<option value="4">绌烘墭鍖�</option>
+ <option value="5">鑰楁潗鍖�</option>
</select>
</div>
</div>
diff --git a/HTML/views/WareHouseSetting/AreaFrom.html b/HTML/views/WareHouseSetting/AreaFrom.html
index d2c4500..afaad72 100644
--- a/HTML/views/WareHouseSetting/AreaFrom.html
+++ b/HTML/views/WareHouseSetting/AreaFrom.html
@@ -37,6 +37,7 @@
<option value="2">鍘熸枡鍖�</option>
<option value="3">鍖呮潗鍖�</option>
<option value="4">绌烘墭鍖�</option>
+ <option value="5">鑰楁潗鍖�</option>
</select>
</div>
</div>
diff --git a/HTML/views/WareHouseSetting/Roadway.html b/HTML/views/WareHouseSetting/Roadway.html
index 8b3986a..636978b 100644
--- a/HTML/views/WareHouseSetting/Roadway.html
+++ b/HTML/views/WareHouseSetting/Roadway.html
@@ -47,6 +47,7 @@
<option value="2">鍘熸枡鍖�</option>
<option value="3">鍖呮潗鍖�</option>
<option value="4">绌烘墭鍖�</option>
+ <option value="5">鑰楁潗鍖�</option>
</select>
</div>
</div>
diff --git a/HTML/views/WareHouseSetting/RoadwayFrom.html b/HTML/views/WareHouseSetting/RoadwayFrom.html
index e26c5fb..f3ffc34 100644
--- a/HTML/views/WareHouseSetting/RoadwayFrom.html
+++ b/HTML/views/WareHouseSetting/RoadwayFrom.html
@@ -37,6 +37,8 @@
<option value="2">鍘熸枡鍖�</option>
<option value="3">鍖呮潗鍖�</option>
<option value="4">绌烘墭鍖�</option>
+ <option value="5">鑰楁潗鍖�</option>
+
</select>
</div>
</div>
diff --git a/Wms/Model/ModelDto/DataDto/StockDetailDto.cs b/Wms/Model/ModelDto/DataDto/StockDetailDto.cs
index e8232fe..d3fd87e 100644
--- a/Wms/Model/ModelDto/DataDto/StockDetailDto.cs
+++ b/Wms/Model/ModelDto/DataDto/StockDetailDto.cs
@@ -208,5 +208,10 @@
/// 鐗╂枡绫诲瀷
/// </summary>
public string Type { get; set; }
+ /// <summary>
+ /// 鐗╂枡绫诲瀷
+ /// </summary>
+ public string CategoryNo { get; set; }
+
}
}
diff --git a/Wms/WMS.BLL/DataServer/StockServer.cs b/Wms/WMS.BLL/DataServer/StockServer.cs
index a527d2c..2f70ce4 100644
--- a/Wms/WMS.BLL/DataServer/StockServer.cs
+++ b/Wms/WMS.BLL/DataServer/StockServer.cs
@@ -137,7 +137,7 @@
/// <param name="ownerName">璐т富鍚嶇О</param>
/// <returns></returns>
public List<StockDetailDto> GetInventoryList1(string skuNo, string skuName, string lotNo, string locatNo, string palletNo,
- string status, string inspectStatus, string ownerNo, string ownerName, string houseNo, string areaNo, string type)
+ string status, string inspectStatus, string ownerNo, string ownerName, string houseNo, string areaNo, string categoryNo, string type)
{
string str = "select detail.*,sku.Type,house.WareHouseNo + '-' + house.WareHouseName as WareHouseName," +
"roadway.RoadwayNo + '-' + roadway.RoadwayName as RoadwayName,area.AreaNo + '-' + area.AreaName as AreaName " +
@@ -146,6 +146,7 @@
"left join SysWareHouse house on detail.WareHouseNo = house.WareHouseNo " +
"left join SysStorageArea area on detail.AreaNo = area.AreaNo " +
"left join SysMaterials as sku on detail.skuNo = sku.skuNo " +
+ "left join SysMaterialCategory as cat on sku.CategoryNo = cat.CategoryNo " +
"Where detail.IsDel = @isdel";
//鍒ゆ柇鐗╂枡缂栫爜鏄惁涓虹┖
if (!string.IsNullOrEmpty(skuNo))
@@ -200,6 +201,10 @@
{
str += " and area.AreaNo = @areaNo";
}
+ if (!string.IsNullOrEmpty(categoryNo))
+ {
+ str += " and area.CategoryNo = @categoryNo";
+ }
if (!string.IsNullOrEmpty(type))
{
str += " and sku.Type = @type";
@@ -221,6 +226,7 @@
ownerName = "%" + ownerName + "%", //璐т富鍚嶇О
wareHouseNo = houseNo,
areaNo = areaNo, //鎵�灞炲尯鍩�
+ categoryNo = categoryNo, //閫昏緫搴撳尯
type = type
});
return stockDetailsList;
diff --git a/Wms/WMS.BLL/SysServer/StorageRoadwayServer.cs b/Wms/WMS.BLL/SysServer/StorageRoadwayServer.cs
index 3c16a1d..04f9b03 100644
--- a/Wms/WMS.BLL/SysServer/StorageRoadwayServer.cs
+++ b/Wms/WMS.BLL/SysServer/StorageRoadwayServer.cs
@@ -226,6 +226,9 @@
case "4":
str = "绌烘墭鍖�";
break;
+ case "5":
+ str = "鑰楁潗鍖�";
+ break;
}
return str;
}
diff --git a/Wms/WMS.IBLL/IDataServer/IStockServer.cs b/Wms/WMS.IBLL/IDataServer/IStockServer.cs
index fd3e98c..506e689 100644
--- a/Wms/WMS.IBLL/IDataServer/IStockServer.cs
+++ b/Wms/WMS.IBLL/IDataServer/IStockServer.cs
@@ -31,7 +31,7 @@
/// <param name="inspectStatus">璐ㄦ鐘舵��</param>
/// <returns></returns>
List<StockDetailDto> GetInventoryList1(string skuNo, string skuName, string lotNo, string locatNo, string palletNo,
- string status, string inspectStatus, string ownerNo, string ownerName, string houseNo, string areaNo, string type);
+ string status, string inspectStatus, string ownerNo, string ownerName, string houseNo, string areaNo,string categoryNo, string type);
#endregion
diff --git a/Wms/Wms/Controllers/DownApiController.cs b/Wms/Wms/Controllers/DownApiController.cs
index 436b342..8729e68 100644
--- a/Wms/Wms/Controllers/DownApiController.cs
+++ b/Wms/Wms/Controllers/DownApiController.cs
@@ -35,7 +35,7 @@
private readonly IPdaSoServer _pdaSoSvc;//绌烘墭鍑哄簱Svc
private readonly IPdaAsnServer _paAsnSvc;//绌烘墭璺虹粦瀹�
- public DownApiController(IOptions<ApiUrlConfig> setting, IExportNoticeServer exNoticeSvc, IPalletBindServer asnPalletBindSvc, IStockCheckServer crCheckSvc, ITaskServer taskSvc, IPdaSoServer pdaSoSvc)
+ public DownApiController(IOptions<ApiUrlConfig> setting, IExportNoticeServer exNoticeSvc, IPalletBindServer asnPalletBindSvc, IStockCheckServer crCheckSvc, ITaskServer taskSvc, IPdaSoServer pdaSoSvc,IPdaAsnServer paAsnSvc)
{
_config = setting.Value;
_exNoticeSvc = exNoticeSvc;
@@ -43,6 +43,7 @@
_crCheckSvc = crCheckSvc;
_taskSvc = taskSvc;
_pdaSoSvc = pdaSoSvc;
+ _paAsnSvc = paAsnSvc;
}
#region WMS鎺ュ彛 璋冪敤涓嬫父绯荤粺鎺ュ彛
diff --git a/Wms/Wms/Controllers/StatisticalController.cs b/Wms/Wms/Controllers/StatisticalController.cs
index 4168244..527e43c 100644
--- a/Wms/Wms/Controllers/StatisticalController.cs
+++ b/Wms/Wms/Controllers/StatisticalController.cs
@@ -71,10 +71,10 @@
/// <returns></returns>
[HttpGet]
public IActionResult GetInventoryList1(string skuNo, string skuName, string lotNo, string locatNo, string palletNo,
- string status, string inspectStatus, string ownerNo, string ownerName,string HouseNo,string AreaNo, string Type)
+ string status, string inspectStatus, string ownerNo, string ownerName,string HouseNo,string AreaNo, string CategoryNo, string Type)
{
List<StockDetailDto> stockDetailsList = _stock.GetInventoryList1(skuNo, skuName, lotNo, locatNo, palletNo,
- status, inspectStatus, ownerNo, ownerName, HouseNo, AreaNo, Type);
+ status, inspectStatus, ownerNo, ownerName, HouseNo, AreaNo, CategoryNo, Type);
return Ok(new
{
data = stockDetailsList,
--
Gitblit v1.8.0