From d9f292a9484ff1efb5d4ccc3076ff16d405459ca Mon Sep 17 00:00:00 2001
From: bklLiudl <673013083@qq.com>
Date: 星期五, 15 三月 2024 11:24:29 +0800
Subject: [PATCH] Merge branch 'master' into Liudl
---
HTML/views/WareHouseSetting/StorageLegend.html | 84 ++++++-----
Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs | 4
Wms/Wms/Controllers/BllAsnController.cs | 2
HTML/views/StatisticalReport/BoxInfor.html | 25 +++
HTML/views/WareHouseSetting/FlatLibraryLegend.html | 100 ++++++++++++++
Wms/WMS.BLL/BllCheckServer/StockCheckServer.cs | 10 +
HTML/views/ASNSetting/LabelPrintSelect.html | 8 +
Wms/WMS.BLL/DataServer/StockServer.cs | 6
Wms/Wms/appsettings.json | 3
HTML/views/StatisticalReport/InventoryStatistics.html | 51 +++++--
HTML/views/ASNSetting/ArrivalNotice.html | 4
Wms/Model/ModelVm/BllAsnVm/BoxInfoVm.cs | 1
Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs | 30 ++++
Wms/WMS.BLL/SysServer/StorageLocatServer.cs | 72 +++++----
HTML/views/ASNSetting/LabelPrint.html | 8
Wms/WMS.IBLL/IBllAsnServer/IBllBoxInfoServer.cs | 2
16 files changed, 303 insertions(+), 107 deletions(-)
diff --git a/HTML/views/ASNSetting/ArrivalNotice.html b/HTML/views/ASNSetting/ArrivalNotice.html
index 918055e..4c52f8f 100644
--- a/HTML/views/ASNSetting/ArrivalNotice.html
+++ b/HTML/views/ASNSetting/ArrivalNotice.html
@@ -1193,7 +1193,7 @@
layer.open({
type: 2,
title: '鐢熸垚鏍囩',
- content: 'LabelPrintSelect.html?Id='+id,
+ content: 'LabelPrintSelect.html?Id='+id+'&SupplierLot='+data.SupplierLot,
maxmin: true,
area: ['480px', '615px'],
btn: ['纭畾','鍙栨秷'],
@@ -1207,7 +1207,7 @@
console.log(field);
//鎻愪氦 Ajax 鎴愬姛鍚庯紝闈欐�佹洿鏂拌〃鏍间腑鐨勬暟鎹�
//"&Level="+field.level+"&Type="+field.type+"&BoxType="+field.boxType+"&Qty="+field.qty+
- var str = "Id="+id+"&IsReset="+field.reset+"&ArriveQty="+field.arriveQty+"&ProductionTime="+field.productionTime+"&ExpirationTime="+field.expirationTime+"&StoreTime="+field.storeTime;
+ var str = "Id="+id+"&IsReset="+field.reset+"&ArriveQty="+field.arriveQty+"&ProductionTime="+field.productionTime+"&ExpirationTime="+field.expirationTime+"&StoreTime="+field.storeTime+"&SupplierLot="+field.SupplierLot;
layer.open({
type: 2,
diff --git a/HTML/views/ASNSetting/LabelPrint.html b/HTML/views/ASNSetting/LabelPrint.html
index 2519584..a17677f 100644
--- a/HTML/views/ASNSetting/LabelPrint.html
+++ b/HTML/views/ASNSetting/LabelPrint.html
@@ -118,6 +118,9 @@
var productionTime = getQueryString('ProductionTime');
var expirationTime = getQueryString('ExpirationTime');
var storeTime = getQueryString('StoreTime');
+
+ var supplierLot=getQueryString('SupplierLot'); //渚涜揣鎵规
+ $("#SupplierLot").html(supplierLot);
var doing = true;
// console.log(productionTime);
@@ -136,7 +139,8 @@
ArriveQty:arriveQty,
ProductionTime:productionTime,
ExpirationTime:expirationTime,
- StoreTime:storeTime
+ StoreTime:storeTime,
+ SupplierLot:supplierLot//渚涜揣鎵规
};
// console.log(param);
synData(IP + "/BllAsn/AddLabelBox", param , 'post', function (res) {
@@ -182,7 +186,7 @@
$("#Standard").html(res.data.Standard);
$("#PackageStandard").html(res.data.PackageStandard);
$("#SkuNo").html(res.data.SkuNo);
- $("#SupplierLot").html(res.data.SupplierLot);
+
$("#ExpirationTime").html(expirationTime);
$("#StoreTime").html( storeTime);
diff --git a/HTML/views/ASNSetting/LabelPrintSelect.html b/HTML/views/ASNSetting/LabelPrintSelect.html
index b2efa30..7e1d8e8 100644
--- a/HTML/views/ASNSetting/LabelPrintSelect.html
+++ b/HTML/views/ASNSetting/LabelPrintSelect.html
@@ -11,6 +11,12 @@
<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>
+ <div class="layui-input-block">
+ <input type="text" name="SupplierLot" id="SupplierLot" placeholder="璇疯緭鍏ヤ緵璐ф壒娆�" autocomplete="off" class="layui-input">
+ </div>
+ </div>
<div class="layui-form-item">
<label class="layui-form-label">鐢熶骇鏃ユ湡</label>
<div class="layui-input-block">
@@ -116,6 +122,8 @@
});
var id = getQueryString('Id');
+ var SupplierLot=getQueryString('SupplierLot');//渚涜揣鎵规
+ $('#SupplierLot').val(SupplierLot);
var asnType = getQueryString('Type');
console.log(asnType);
console.log(asnType == 4);
diff --git a/HTML/views/StatisticalReport/BoxInfor.html b/HTML/views/StatisticalReport/BoxInfor.html
index b5bb0b4..d8fb7df 100644
--- a/HTML/views/StatisticalReport/BoxInfor.html
+++ b/HTML/views/StatisticalReport/BoxInfor.html
@@ -79,7 +79,7 @@
<input type="text" id="BoxNo" name="BoxNo" placeholder="绠辩爜" autocomplete="off" class="layui-input">
</div>
</div>
- <div class="layui-inline zhijian">
+ <!-- <div class="layui-inline zhijian">
<label class="layui-form-label" style="width: 60px;">绠辨敮鐘舵��</label>
<div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
<select name="Status" id="Status" lay-search>
@@ -90,7 +90,7 @@
<option value="3">宸插嚭搴�</option>
</select>
</div>
- </div>
+ </div> -->
<div class="layui-inline zhijian">
<label class="layui-form-label" style="width: 60px;">鎶芥鏍囪</label>
<div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
@@ -397,6 +397,8 @@
{field: 'SkuName', title: '鐗╂枡鍚嶇О', align: 'center'},
{field: 'OwnerNo',title: '璐т富缂栫爜',align: 'center'},
{field: 'OwnerName',title: '璐т富鍚嶇О',align: 'center'},
+ {field: 'SupplierNo',title: '渚涘簲鍟嗙紪鐮�',align: 'center'},
+ {field: 'SupplierName',title: '渚涘簲鍟嗗悕绉�',align: 'center'},
{field: 'LotNo', title: '鎵规鍙�', align: 'center'},
{field: 'LotText', title: '鎵规鎻忚堪', align: 'center'},
{field: 'SupplierLot', title: '渚涜揣鎵规', align: 'center'},
@@ -687,14 +689,29 @@
//鐩戝惉Tab鍒囨崲锛屼互鏀瑰彉鍦板潃hash鍊�
element.on('tab(docDemoTabBrief)', function(data){
+ var SkuNo = $("#SkuNo").val();
+ var SkuName = $("#SkuName").val();
+ var LotNo = $("#LotNo").val();
+ var PalletNo = $("#PalletNo").val();
+
+ var BoxNo = $("#BoxNo").val();
+ var Status = $("#Status").val();
+ var InspectMark = $("#InspectMark").val();
+ var BitPalletMark = $("#BitPalletMark").val();
+ var BitBoxMark = $("#BitBoxMark").val();
+ var InspectStatus = $("#InspectStatus").val();
+
+ var OwnerNo = $("#OwnerNo").val();
+ var OwnerName = $("#OwnerName").val();
+
console.log(data.index);
yemianid = data.index
if(yemianid == 0){
console.log("鎬诲崟");
- refreshTable("","","","","","","","","","","","");
+ refreshTable(SkuNo,SkuName,PalletNo,LotNo,BoxNo,Status,InspectMark,BitPalletMark,BitBoxMark,InspectStatus,OwnerNo,OwnerName);
}else if(yemianid == 1){
console.log("鏄庣粏");
- refreshTable2(quanid);
+ refreshTable2(quanid,SkuNo,SkuName,LotNo,PalletNo,BoxNo,Status,InspectMark,BitBoxMark,InspectStatus);
}
});
var doing = true;
diff --git a/HTML/views/StatisticalReport/InventoryStatistics.html b/HTML/views/StatisticalReport/InventoryStatistics.html
index cee3e63..878f85c 100644
--- a/HTML/views/StatisticalReport/InventoryStatistics.html
+++ b/HTML/views/StatisticalReport/InventoryStatistics.html
@@ -296,7 +296,7 @@
var $ = layui.$;
var yemianid = 0;
- refreshTable("", "");
+ refreshTable("", "","","","");
// 琛ㄥ崟闇�瑕佺殑鍙橀噺
var infoOptions;
@@ -368,7 +368,7 @@
var TotalColsSysArr=encodeURIComponent(encodeURIComponent(JSON.stringify(TotalColsArr)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜
//#endregion
//鑾峰彇鎬婚噺淇℃伅
- function refreshTable() {
+ function refreshTable(SkuNo,SkuName,OwnerNo,OwnerName,LotNo) {
//#region 鑷畾涔夎〃澶�
var colsJson
var param1={
@@ -400,8 +400,14 @@
},
cols:colsJson
};
-
- sendData(IP + "/Statistical/GetInventoryList?SkuNo=" + $("#SkuNo").val() + "&&SkuName=" + $("#SkuName").val() + "&&OwnerNo=" + $("#OwnerNo").val()+ "&&OwnerName=" + $("#OwnerName").val()+"&&LotNo=" + $("#LotNo").val(), {}, 'get', function (res) {
+ var param = {
+ SkuNo:SkuNo, //鐗╂枡鍙�
+ SkuName:SkuName, //鐗╂枡鍚嶇О
+ OwnerNo:OwnerNo, //璐т富缂栫爜
+ OwnerName:OwnerName, //璐т富鍚嶇О
+ LotNo:LotNo, //鎵规鍙�
+ };
+ sendData(IP + "/Statistical/GetInventoryList", param, 'get', function (res) {
console.log(res)
if (res.code == 0) { //鎴愬姛
var list = res.data;
@@ -537,7 +543,7 @@
]];
var DetailColsSysArr=encodeURIComponent(encodeURIComponent(JSON.stringify(DetailColsArr)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜
//#endregion
- function refreshTable2(sku,lotNo) {
+ function refreshTable2(SkuNo,SkuName,OwnerNo,OwnerName,LotNo,LocatNo,PalletNo,Status,InspectStatus) {
//#region 鑷畾涔夎〃澶�
var colsJson2
var param1={
@@ -568,8 +574,18 @@
},
cols:colsJson2
};
-
- sendData(IP + "/Statistical/GetInventoryList1?SkuNo=" + sku + "&&SkuName=" + $("#SkuName").val() + "&&LotNo=" + lotNo + "&&LocatNo=" + $("#LocatNo").val() + "&&PalletNo=" + $("#PalletNo").val() + "&&Status=" + $("#Status").val() + "&&InspectStatus=" + $("#InspectStatus").val()+ "&&OwnerNo=" + $("#OwnerNo").val()+ "&&OwnerName=" + $("#OwnerName").val(), {}, 'get', function (res) {
+ var param = {
+ SkuNo:SkuNo, //鐗╂枡鍙�
+ SkuName:SkuName, //鐗╂枡鍚嶇О
+ OwnerNo:OwnerNo, //璐т富缂栫爜
+ OwnerName:OwnerName, //璐т富鍚嶇О
+ LotNo:LotNo, //鎵规鍙�
+ LocatNo:LocatNo,//鍌ㄤ綅鍦板潃
+ PalletNo:PalletNo, //鎵樼洏鍙�
+ Status:Status,//搴撳瓨鐘舵��
+ InspectStatus:InspectStatus //璐ㄦ鐘舵��
+ };
+ sendData(IP + "/Statistical/GetInventoryList1", param, 'get', function (res) {
if (res.code == 0) //鎴愬姛
{
var list = res.data;
@@ -595,8 +611,6 @@
//var url = IP + "/Statistical/GetInventoryList1";
-
-
//鎺ュ彈鍏ㄥ眬鍙橀噺
let quanSkuNo = '';
let quanLotNo='';
@@ -613,12 +627,12 @@
var InspectStatus = $("#InspectStatus").val();
if (yemianid == 0) {
console.log("鎬诲崟");
- refreshTable(SkuNo, SkuName);
+ refreshTable(SkuNo, SkuName,OwnerNo,OwnerName,LotNo);
} else if (yemianid == 1) {
quanSkuNo = '';
quanLotNo='';
console.log("鏄庣粏");
- refreshTable2(SkuNo,LotNo);
+ refreshTable2(SkuNo,SkuName,OwnerNo,OwnerName,LotNo,LocatNo,PalletNo,Status,InspectStatus);
}
});
@@ -631,20 +645,29 @@
console.log(obj);
quanSkuNo = obj.data.SkuNo;
quanLotNo=obj.data.lotNo;
- refreshTable2(obj.data.SkuNo,obj.data.LotNo);
+ refreshTable2(obj.data.SkuNo,"","","",obj.data.LotNo);
yemianid = 1;
});
//鐩戝惉Tab鍒囨崲锛屼互鏀瑰彉鍦板潃hash鍊�
element.on('tab(docDemoTabBrief)', function (data) {
+ var SkuNo = $("#SkuNo").val();
+ var SkuName = $("#SkuName").val();
+ var LotNo = $("#LotNo").val();
+ var LocatNo = $("#LocatNo").val();
+ var PalletNo = $("#PalletNo").val();
+ var OwnerNo = $("#OwnerNo").val();
+ var OwnerName = $("#OwnerName").val();
+ var Status = $("#Status").val();
+ var InspectStatus = $("#InspectStatus").val();
console.log(data.index);
yemianid = data.index
if (yemianid == 0) {
console.log("鎬诲崟");
- refreshTable(SkuNo, SkuName);
+ refreshTable(SkuNo, SkuName,OwnerNo,OwnerName,LotNo);
} else if (yemianid == 1) {
console.log("鏄庣粏");
- refreshTable2(quanSkuNo,quanLotNo);
+ refreshTable2(SkuNo,SkuName,OwnerNo,OwnerName,LotNo,LocatNo,PalletNo,Status,InspectStatus);
}
});
diff --git a/HTML/views/WareHouseSetting/FlatLibraryLegend.html b/HTML/views/WareHouseSetting/FlatLibraryLegend.html
index e344b1d..cab5d59 100644
--- a/HTML/views/WareHouseSetting/FlatLibraryLegend.html
+++ b/HTML/views/WareHouseSetting/FlatLibraryLegend.html
@@ -160,6 +160,10 @@
<!-- 鍌ㄤ綅鍥句緥 -->
<table style="margin:0 auto;">
<tr>
+ <td><button class="btnShow1 five" disabled></button></td>
+ <td>绉诲嚭涓�</td>
+ <td><button class="btnShow1 four" disabled></button></td>
+ <td>绉诲叆涓�</td>
<td><button class="btnShow1 three" disabled></button></td>
<td>鍑哄簱涓�</td>
<td><button class="btnShow1 two" disabled></button></td>
@@ -488,6 +492,14 @@
else if (item.Status == 3) {
html1 += '<td><button value=' + item.LocatNo + ' class="btnShow three" style="width: 100%;height: 100%;" ></button></td>'
}
+ //绉诲叆涓� 4
+ else if (item.Status == 4) {
+ html1 += '<td><button value=' + item.LocatNo + ' class="btnShow four" style="width: 100%;height: 100%;" ></button></td>'
+ }
+ //绉诲嚭涓� 5
+ else if (item.Status == 5) {
+ html1 += '<td><button value=' + item.LocatNo + ' class="btnShow five" style="width: 100%;height: 100%;" ></button></td>'
+ }
} else {
// console.log(i, a);
html1 += '<td></td>'
@@ -522,6 +534,14 @@
else if (item.Status == 3) {
html2 += '<td><button value=' + item.LocatNo + ' class="btnShow three" style="width: 100%;height: 100%;" ></button></td>'
}
+ //绉诲叆涓� 4
+ else if (item.Status == 4) {
+ html2 += '<td><button value=' + item.LocatNo + ' class="btnShow four" style="width: 100%;height: 100%;" ></button></td>'
+ }
+ //绉诲嚭涓� 5
+ else if (item.Status == 5) {
+ html2 += '<td><button value=' + item.LocatNo + ' class="btnShow five" style="width: 100%;height: 100%;" ></button></td>'
+ }
} else {
// console.log(i, a);
html2 += '<td></td>'
@@ -555,6 +575,14 @@
else if (item.Status == 3) {
html3 += '<td><button value=' + item.LocatNo + ' class="btnShow three" style="width: 100%;height: 100%;" ></button></td>'
}
+ //绉诲叆涓� 4
+ else if (item.Status == 4) {
+ html3 += '<td><button value=' + item.LocatNo + ' class="btnShow four" style="width: 100%;height: 100%;" ></button></td>'
+ }
+ //绉诲嚭涓� 5
+ else if (item.Status == 5) {
+ html3 += '<td><button value=' + item.LocatNo + ' class="btnShow five" style="width: 100%;height: 100%;" ></button></td>'
+ }
} else {
// console.log(i, a);
html3 += '<td></td>'
@@ -587,6 +615,14 @@
else if (item.Status == 3) {
html4 += '<td><button value=' + item.LocatNo + ' class="btnShow three" style="width: 100%;height: 100%;" ></button></td>'
}
+ //绉诲叆涓� 4
+ else if (item.Status == 4) {
+ html4 += '<td><button value=' + item.LocatNo + ' class="btnShow four" style="width: 100%;height: 100%;" ></button></td>'
+ }
+ //绉诲嚭涓� 5
+ else if (item.Status == 5) {
+ html4 += '<td><button value=' + item.LocatNo + ' class="btnShow five" style="width: 100%;height: 100%;" ></button></td>'
+ }
} else {
// console.log(i, a);
html4 += '<td></td>'
@@ -618,6 +654,14 @@
//鍑哄簱涓� 3
else if (item.Status == 3) {
html5 += '<td><button value=' + item.LocatNo + ' class="btnShow three" style="width: 100%;height: 100%;" ></button></td>'
+ }
+ //绉诲叆涓� 4
+ else if (item.Status == 4) {
+ html5 += '<td><button value=' + item.LocatNo + ' class="btnShow four" style="width: 100%;height: 100%;" ></button></td>'
+ }
+ //绉诲嚭涓� 5
+ else if (item.Status == 5) {
+ html5 += '<td><button value=' + item.LocatNo + ' class="btnShow five" style="width: 100%;height: 100%;" ></button></td>'
}
} else {
// console.log(i, a);
@@ -653,6 +697,14 @@
else if (item.Status == 3) {
html6 += '<td><button value=' + item.LocatNo + ' class="btnShow three" style="width: 100%;height: 100%;" ></button></td>'
}
+ //绉诲叆涓� 4
+ else if (item.Status == 4) {
+ html6 += '<td><button value=' + item.LocatNo + ' class="btnShow four" style="width: 100%;height: 100%;" ></button></td>'
+ }
+ //绉诲嚭涓� 5
+ else if (item.Status == 5) {
+ html6 += '<td><button value=' + item.LocatNo + ' class="btnShow five" style="width: 100%;height: 100%;" ></button></td>'
+ }
} else {
// console.log(i, a);
html6 += '<td></td>'
@@ -687,6 +739,14 @@
//鍑哄簱涓� 3
else if (item.Status == 3) {
html7 += '<td><button value=' + item.LocatNo + ' class="btnShow three" style="width: 100%;height: 100%;" ></button></td>'
+ }
+ //绉诲叆涓� 4
+ else if (item.Status == 4) {
+ html7 += '<td><button value=' + item.LocatNo + ' class="btnShow four" style="width: 100%;height: 100%;" ></button></td>'
+ }
+ //绉诲嚭涓� 5
+ else if (item.Status == 5) {
+ html7 += '<td><button value=' + item.LocatNo + ' class="btnShow five" style="width: 100%;height: 100%;" ></button></td>'
}
} else {
// console.log(i, a);
@@ -735,6 +795,14 @@
else if (item.Status == 3) {
html5 += '<td><button value=' + item.LocatNo + ' class="btnShow three" style="width: 100%;height: 100%;" ></button></td>'
}
+ //绉诲叆涓� 4
+ else if (item.Status == 4) {
+ html5 += '<td><button value=' + item.LocatNo + ' class="btnShow four" style="width: 100%;height: 100%;" ></button></td>'
+ }
+ //绉诲嚭涓� 5
+ else if (item.Status == 5) {
+ html5 += '<td><button value=' + item.LocatNo + ' class="btnShow five" style="width: 100%;height: 100%;" ></button></td>'
+ }
} else {
// console.log(i, a);
html5 += '<td></td>'
@@ -769,6 +837,14 @@
else if (item.Status == 3) {
html7 += '<td><button value=' + item.LocatNo + ' class="btnShow three" style="width: 100%;height: 100%;" ></button></td>'
}
+ //绉诲叆涓� 4
+ else if (item.Status == 4) {
+ html7 += '<td><button value=' + item.LocatNo + ' class="btnShow four" style="width: 100%;height: 100%;" ></button></td>'
+ }
+ //绉诲嚭涓� 5
+ else if (item.Status == 5) {
+ html7 += '<td><button value=' + item.LocatNo + ' class="btnShow five" style="width: 100%;height: 100%;" ></button></td>'
+ }
} else {
// console.log(i, a);
html7 += '<td></td>'
@@ -801,6 +877,14 @@
//鍑哄簱涓� 3
else if (item.Status == 3) {
html2 += '<td><button value=' + item.LocatNo + ' class="btnShow three" style="width: 100%;height: 100%;" ></button></td>'
+ }
+ //绉诲叆涓� 4
+ else if (item.Status == 4) {
+ html2 += '<td><button value=' + item.LocatNo + ' class="btnShow four" style="width: 100%;height: 100%;" ></button></td>'
+ }
+ //绉诲嚭涓� 5
+ else if (item.Status == 5) {
+ html2 += '<td><button value=' + item.LocatNo + ' class="btnShow five" style="width: 100%;height: 100%;" ></button></td>'
}
} else {
// console.log(i, a);
@@ -835,6 +919,14 @@
else if (item.Status == 3) {
html1 += '<td><button value=' + item.LocatNo + ' class="btnShow three" style="width: 100%;height: 100%;" ></button></td>'
}
+ //绉诲叆涓� 4
+ else if (item.Status == 4) {
+ html1 += '<td><button value=' + item.LocatNo + ' class="btnShow four" style="width: 100%;height: 100%;" ></button></td>'
+ }
+ //绉诲嚭涓� 5
+ else if (item.Status == 5) {
+ html1 += '<td><button value=' + item.LocatNo + ' class="btnShow five" style="width: 100%;height: 100%;" ></button></td>'
+ }
} else {
// console.log(i, a);
html1 += '<td></td>'
@@ -867,6 +959,14 @@
else if (item.Status == 3) {
html4 += '<td><button value=' + item.LocatNo + ' class="btnShow three" style="width: 100%;height: 100%;" ></button></td>'
}
+ //绉诲叆涓� 4
+ else if (item.Status == 4) {
+ html4 += '<td><button value=' + item.LocatNo + ' class="btnShow four" style="width: 100%;height: 100%;" ></button></td>'
+ }
+ //绉诲嚭涓� 5
+ else if (item.Status == 5) {
+ html4 += '<td><button value=' + item.LocatNo + ' class="btnShow five" style="width: 100%;height: 100%;" ></button></td>'
+ }
} else {
// console.log(i, a);
html4 += '<td></td>'
diff --git a/HTML/views/WareHouseSetting/StorageLegend.html b/HTML/views/WareHouseSetting/StorageLegend.html
index 22313ca..4823a11 100644
--- a/HTML/views/WareHouseSetting/StorageLegend.html
+++ b/HTML/views/WareHouseSetting/StorageLegend.html
@@ -152,6 +152,10 @@
<!-- 鍌ㄤ綅鍥句緥 -->
<table style="margin:0 auto;">
<tr>
+ <td><button class="btnShow five" disabled></button></td>
+ <td>绉诲嚭涓�</td>
+ <td><button class="btnShow four" disabled></button></td>
+ <td>绉诲叆涓�</td>
<td><button class="btnShow three" disabled></button></td>
<td>鍑哄簱涓�</td>
<td><button class="btnShow two" disabled></button></td>
@@ -569,13 +573,13 @@
}
//绉诲叆涓� 4
- // if (statu.Status == 4) {
- // html += '<td style="height:auto;width:auto"><button value=' + statu.LocatNo + ' class="btnShow four" style="height:' + height3 + 'px;width:' + svmwidth + 'px"></button></td>'
- // }
+ if (statu.Status == 4) {
+ html += '<td style="height:auto;width:auto"><button value=' + statu.LocatNo + ' class="btnShow four" style="height:' + height3 + 'px;width:' + svmwidth + 'px"></button></td>'
+ }
//绉诲嚭涓� 5
- // if (statu.Status == 5) {
- // html += '<td style="height:auto;width:auto"><button value=' + statu.LocatNo + ' class="btnShow five" style="height:' + height3 + 'px;width:' + svmwidth + 'px"></button></td>'
- // }
+ if (statu.Status == 5) {
+ html += '<td style="height:auto;width:auto"><button value=' + statu.LocatNo + ' class="btnShow five" style="height:' + height3 + 'px;width:' + svmwidth + 'px"></button></td>'
+ }
} else {
// console.log(i, a);
@@ -624,7 +628,7 @@
var list = res.data;
//0锛氱┖鍌ㄤ綅 1锛氭湁鐗╁搧 2锛氬叆搴撲腑 3锛氬嚭搴撲腑 4锛氱Щ鍏ヤ腑 5锛氱Щ鍑轰腑 6: 鎹熷潖\灞忚斀
- var key = ['绌哄偍浣�', '鏈夌墿鍝�', '鍏ュ簱涓�', '鍑哄簱涓�', '鎹熷潖\灞忚斀'];
+ var key = ['绌哄偍浣�', '鏈夌墿鍝�', '鍏ュ簱涓�', '鍑哄簱涓�','绉诲叆涓�','绉诲嚭涓�', '鎹熷潖\灞忚斀'];
var value = [0,0,0,0,0,0,0];
list.forEach(item => {
value[item.Status] = item.StatusNum;
@@ -637,8 +641,8 @@
'#91cc75',
'#ffdc60',
'#ee6666',
- // '#ffff7f',
- // '#ee23ee',
+ '#ffff7f',
+ '#ee23ee',
'#808080',
],
title: {
@@ -665,8 +669,8 @@
{ value: value[1], name: key[1] }, //鏈夌墿鍝�
{ value: value[2], name: key[2] }, //鍏ュ簱涓�
{ value: value[3], name: key[3] }, //鍑哄簱涓�
- // { value: value[4], name: key[4] },
- // { value: value[5], name: key[5] },
+ { value: value[4], name: key[4] }, //绉诲叆涓�
+ { value: value[5], name: key[5] }, //绉诲嚭涓�
{ value: value[6], name: key[4] }, //鎹熷潖\灞忚斀
],
// emphasis: {
@@ -698,7 +702,7 @@
var list = res.data;
//0锛氱┖鍌ㄤ綅 1锛氭湁鐗╁搧 2锛氬叆搴撲腑 3锛氬嚭搴撲腑 4锛氱Щ鍏ヤ腑 5锛氱Щ鍑轰腑 6锛氭崯鍧廫灞忚斀
- var key = ['绌哄偍浣�', '鏈夌墿鍝�', '鍏ュ簱涓�', '鍑哄簱涓�','鎹熷潖\灞忚斀'];
+ var key = ['绌哄偍浣�', '鏈夌墿鍝�', '鍏ュ簱涓�', '鍑哄簱涓�','绉诲叆涓�','绉诲嚭涓�','鎹熷潖\灞忚斀'];
this.chartLine2 = echarts.init(document.getElementById("zhu"));
//宸烽亾
var roarylist = [xianga, xiangb];
@@ -707,8 +711,8 @@
var status1 = [];
var status2 = [];
var status3 = [];
- // var status4 = [];
- // var status5 = [];
+ var status4 = [];
+ var status5 = [];
var status6 = [];
//鑾峰彇
//鎬�
@@ -725,12 +729,12 @@
if (list[i].Status == '3') {
status3.push(list[i].StatusNum)
}
- // if (list[i].Status == '4') {
- // status4.push(list[i].StatusNum)
- // }
- // if (list[i].Status == '5') {
- // status5.push(list[i].StatusNum)
- // }
+ if (list[i].Status == '4') {
+ status4.push(list[i].StatusNum)
+ }
+ if (list[i].Status == '5') {
+ status5.push(list[i].StatusNum)
+ }
if (list[i].Status == '6') {
status6.push(list[i].StatusNum)
}
@@ -845,26 +849,26 @@
},
data: status3
},
- // {
- // name: '绉诲叆涓�',
- // type: 'bar',
- // color: '#ffff7f',
- // //label: labelOption,
- // emphasis: {
- // focus: 'series'
- // },
- // data: status4
- // },
- // {
- // name: '绉诲嚭涓�',
- // type: 'bar',
- // color: '#ee23ee',
- // //label: labelOption,
- // emphasis: {
- // focus: 'series'
- // },
- // data: status5
- // },
+ {
+ name: '绉诲叆涓�',
+ type: 'bar',
+ color: '#ffff7f',
+ //label: labelOption,
+ emphasis: {
+ focus: 'series'
+ },
+ data: status4
+ },
+ {
+ name: '绉诲嚭涓�',
+ type: 'bar',
+ color: '#ee23ee',
+ //label: labelOption,
+ emphasis: {
+ focus: 'series'
+ },
+ data: status5
+ },
{
name: '鎹熷潖\灞忚斀',
type: 'bar',
diff --git a/Wms/Model/ModelVm/BllAsnVm/BoxInfoVm.cs b/Wms/Model/ModelVm/BllAsnVm/BoxInfoVm.cs
index 5a4a667..b0afa5a 100644
--- a/Wms/Model/ModelVm/BllAsnVm/BoxInfoVm.cs
+++ b/Wms/Model/ModelVm/BllAsnVm/BoxInfoVm.cs
@@ -205,6 +205,7 @@
public string ProductionTime { get; set; }
public string ExpirationTime { get; set; }
public string StoreTime { get; set; }
+ public string SupplierLot { get; set; }
}
diff --git a/Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs b/Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs
index a78bdc4..9b74c1f 100644
--- a/Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs
+++ b/Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs
@@ -529,7 +529,7 @@
}
//鑾峰彇鏍囩淇℃伅(鐢熸垚鏍囩)
- public List<BllBoxInfo> AddLabelBox(int imId, string isReset, decimal arriveQty, string productionTime, string expirationTime, string storeTime, int userId)
+ public List<BllBoxInfo> AddLabelBox(int imId, string isReset, decimal arriveQty, string productionTime, string expirationTime, string storeTime,string supplierLot, int userId)
{
try
{
@@ -765,7 +765,7 @@
LotNo = maxLotNoStr,
Standard = asnList.Standard,
PackageStandard = packStr,
- SupplierLot = asnList.SupplierLot,
+ SupplierLot = supplierLot,
InspectMark = "0",
BitBoxMark = bNum > boxQty ? "1":"0",
InspectStatus = "",
diff --git a/Wms/WMS.BLL/BllCheckServer/StockCheckServer.cs b/Wms/WMS.BLL/BllCheckServer/StockCheckServer.cs
index c4d119e..ebb1509 100644
--- a/Wms/WMS.BLL/BllCheckServer/StockCheckServer.cs
+++ b/Wms/WMS.BLL/BllCheckServer/StockCheckServer.cs
@@ -1553,7 +1553,7 @@
task.CancelDate = DateTime.Now;
Db.Updateable(task).ExecuteCommand();
- //淇敼鍌ㄤ綅淇℃伅
+ //淇敼璧峰鍌ㄤ綅淇℃伅
var locat = Db.Queryable<SysStorageLocat>().First(a => a.IsDel == "0" && a.WareHouseNo == "W02" && a.LocatNo == task.StartLocat);
if (locat == null)
{
@@ -1562,6 +1562,14 @@
locat.Status = "1"; //鏈夌墿鍝�
Db.Updateable(locat).ExecuteCommand();
+ //淇敼鐩爣鍌ㄤ綅淇℃伅
+ var locatEnd = Db.Queryable<SysStorageLocat>().First(a => a.IsDel == "0" && a.WareHouseNo == "W02" && a.LocatNo == task.EndLocat);
+ if (locatEnd != null)
+ {
+ locatEnd.Status = "0"; //绌哄偍浣�
+ Db.Updateable(locatEnd).ExecuteCommand();
+ }
+
//淇敼搴撳瓨鏄庣粏
var stockDetail = Db.Queryable<DataStockDetail>().First(w => w.IsDel == "0" && w.PalletNo == task.PalletNo);
if (stockDetail == null)
diff --git a/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs
index b2e9536..7b98079 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs
@@ -926,11 +926,23 @@
{
throw new Exception("璇ユ墭鐩樻湭鍦ㄥ钩搴撳唴,璇锋鏌�!");
}
+ //璧峰鍌ㄤ綅淇℃伅
var storageLocat = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.LocatNo == stockDetail.LocatNo);
if (storageLocat == null)
{
throw new Exception("鍌ㄤ綅淇℃伅涓嶅瓨鍦�,璇锋鏌�!");
}
+ //鐩爣鍌ㄤ綅淇℃伅
+ var storageLocatEnd = new SysStorageLocat();
+ if (!string.IsNullOrEmpty(areaNo))
+ {
+ storageLocatEnd = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.LocatNo == EndLocat && w.Flag == "0" && w.Status == "0");
+ if (storageLocatEnd == null)
+ {
+ throw new Exception("鐩爣鍌ㄤ綅淇℃伅涓嶅瓨鍦�,璇锋鏌�!");
+ }
+ }
+
//寮�鍚簨鍔�
Db.BeginTran();
@@ -965,10 +977,16 @@
stock.LockQty += (decimal)stockDetail.Qty;
Db.Updateable(stock).ExecuteCommand();
- //淇敼鍌ㄤ綅鍦板潃鐘舵��
+ //淇敼璧峰鍌ㄤ綅鍦板潃鐘舵��
storageLocat.Status = "5";//0锛氱┖鍌ㄤ綅 1锛氭湁鐗╁搧 2锛氬叆搴撲腑 3锛氬嚭搴撲腑 4锛氱Щ鍏ヤ腑 5锛氱Щ鍑轰腑
Db.Updateable(storageLocat).ExecuteCommand();
+ //淇敼鐩爣鍌ㄤ綅鍦板潃鐘舵��
+ if (storageLocatEnd != null)
+ {
+ storageLocatEnd.Status = "4";//0锛氱┖鍌ㄤ綅 1锛氭湁鐗╁搧 2锛氬叆搴撲腑 3锛氬嚭搴撲腑 4锛氱Щ鍏ヤ腑 5锛氱Щ鍑轰腑
+ Db.Updateable(storageLocatEnd).ExecuteCommand();
+ }
//娣诲姞鎿嶄綔鏃ュ織璁板綍
var k = new OperationCrServer().AddLogOperationCr("PDA妯″潡", "AGV杞繍", palletNo, "绉诲簱", $"PDA鍛煎彨灏忚溅瀵规墭鐩樺彿锛歿palletNo}鍙戣捣杞繍", userId);
//鎻愪氦浜嬪姟
@@ -1053,6 +1071,12 @@
}
string EndLocat = string.Empty;//鐩爣浣嶇疆
EndLocat= GetLocat(areaNo, stockDetail.SkuNo, stockDetail.LotNo,palletNo);
+ //鐩爣鍌ㄤ綅淇℃伅
+ var storageLocatEnd = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.LocatNo == EndLocat && w.Flag == "0" && w.Status == "0");
+ if (storageLocatEnd == null)
+ {
+ throw new Exception("鐩爣鍌ㄤ綅淇℃伅涓嶅瓨鍦�,璇锋鏌�!");
+ }
//寮�鍚簨鍔�
Db.BeginTran();
@@ -1091,6 +1115,10 @@
storageLocat.Status = "5";//0锛氱┖鍌ㄤ綅 1锛氭湁鐗╁搧 2锛氬叆搴撲腑 3锛氬嚭搴撲腑 4锛氱Щ鍏ヤ腑 5锛氱Щ鍑轰腑
Db.Updateable(storageLocat).ExecuteCommand();
+ //淇敼鐩爣鍌ㄤ綅鍦板潃鐘舵��
+ storageLocatEnd.Status = "4";//0锛氱┖鍌ㄤ綅 1锛氭湁鐗╁搧 2锛氬叆搴撲腑 3锛氬嚭搴撲腑 4锛氱Щ鍏ヤ腑 5锛氱Щ鍑轰腑
+ Db.Updateable(storageLocatEnd).ExecuteCommand();
+
//娣诲姞鎿嶄綔鏃ュ織璁板綍
var k = new OperationCrServer().AddLogOperationCr("PDA妯″潡", "AGV杞繍", palletNo, "绉诲簱", $"PDA鍛煎彨灏忚溅瀵规墭鐩樺彿锛歿palletNo}鍙戣捣杞繍", userId);
//鎻愪氦浜嬪姟
diff --git a/Wms/WMS.BLL/DataServer/StockServer.cs b/Wms/WMS.BLL/DataServer/StockServer.cs
index 99a4ebd..6c0ff69 100644
--- a/Wms/WMS.BLL/DataServer/StockServer.cs
+++ b/Wms/WMS.BLL/DataServer/StockServer.cs
@@ -151,11 +151,7 @@
if (!string.IsNullOrEmpty(lotNo))
{
str += " and detail.LotNo like @lotno";
- }
- if (!string.IsNullOrEmpty(skuNo) && string.IsNullOrEmpty(lotNo))
- {
- str += " and detail.LotNo = ''";
- }
+ }
//鍒ゆ柇鍌ㄤ綅鍦板潃鏄惁涓虹┖
if (!string.IsNullOrEmpty(locatNo))
{
diff --git a/Wms/WMS.BLL/SysServer/StorageLocatServer.cs b/Wms/WMS.BLL/SysServer/StorageLocatServer.cs
index d968e79..75671e8 100644
--- a/Wms/WMS.BLL/SysServer/StorageLocatServer.cs
+++ b/Wms/WMS.BLL/SysServer/StorageLocatServer.cs
@@ -473,8 +473,8 @@
int b = 0; //1锛氭湁鐗╁搧
int c = 0; //2锛氬叆搴撲腑
int d = 0; //3锛氬嚭搴撲腑
- //int e = 0; //4锛氱Щ鍏ヤ腑
- //int f = 0; //5锛氱Щ鍑轰腑
+ int e = 0; //4锛氱Щ鍏ヤ腑
+ int f = 0; //5锛氱Щ鍑轰腑
int g = 0; //6锛氭崯鍧廫灞忚斀
foreach (var item in getLocateVms)
@@ -503,18 +503,18 @@
d = 1; //3锛氬嚭搴撲腑
continue;
}
- ////4锛氱Щ鍏ヤ腑
- //if (item.Status == "4")
- //{
- // e = 1; //4锛氱Щ鍏ヤ腑
- // continue;
- //}
- ////5锛氱Щ鍑轰腑
- //if (item.Status == "5")
- //{
- // f = 1; //5锛氱Щ鍑轰腑
- // continue;
- //}
+ //4锛氱Щ鍏ヤ腑
+ if (item.Status == "4")
+ {
+ e = 1; //4锛氱Щ鍏ヤ腑
+ continue;
+ }
+ //5锛氱Щ鍑轰腑
+ if (item.Status == "5")
+ {
+ f = 1; //5锛氱Щ鍑轰腑
+ continue;
+ }
//6锛氭崯鍧廫灞忚斀
if (item.Status == "6")
{
@@ -559,24 +559,24 @@
getLocateVm.Status = "3";
getLocateVms.Add(getLocateVm);
}
- ////4锛氱Щ鍏ヤ腑
- //if (e == 0)
- //{
- // getLocateVm = new GetLocateVm();
- // getLocateVm.WareHouseNo = wareHouseNo; //浠撳簱鍙�
- // getLocateVm.StatusNum = "0";
- // getLocateVm.Status = "4";
- // getLocateVms.Add(getLocateVm);
- //}
- ////5锛氱Щ鍑轰腑
- //if (f == 0)
- //{
- // getLocateVm = new GetLocateVm();
- // getLocateVm.WareHouseNo = wareHouseNo; //浠撳簱鍙�
- // getLocateVm.StatusNum = "0";
- // getLocateVm.Status = "5";
- // getLocateVms.Add(getLocateVm);
- //}
+ //4锛氱Щ鍏ヤ腑
+ if (e == 0)
+ {
+ getLocateVm = new GetLocateVm();
+ getLocateVm.WareHouseNo = wareHouseNo; //浠撳簱鍙�
+ getLocateVm.StatusNum = "0";
+ getLocateVm.Status = "4";
+ getLocateVms.Add(getLocateVm);
+ }
+ //5锛氱Щ鍑轰腑
+ if (f == 0)
+ {
+ getLocateVm = new GetLocateVm();
+ getLocateVm.WareHouseNo = wareHouseNo; //浠撳簱鍙�
+ getLocateVm.StatusNum = "0";
+ getLocateVm.Status = "5";
+ getLocateVms.Add(getLocateVm);
+ }
//6锛氭崯鍧廫灞忚斀
if (g == 0)
{
@@ -672,7 +672,7 @@
throw new Exception("鏈壘鍒板搴斿偍浣�");
}
//鏈夌墿鍝併�佸嚭搴撲腑鏁版嵁婧愶紙搴撳瓨鏄庣粏琛級
- if (storageLocat.Status == "1" || storageLocat.Status == "3")
+ if (storageLocat.Status == "1" || storageLocat.Status == "3" || storageLocat.Status == "5")
{
//搴撳瓨鏄庣粏
List<DataStockDetail> stockDetailList = Db.Queryable<DataStockDetail>().Where(w => w.LocatNo == locatNo && w.IsDel == "0").ToList();
@@ -750,6 +750,12 @@
case "3":
model.Status = "鍑哄簱涓�";
break;
+ case "4":
+ model.Status = "绉诲叆涓�";
+ break;
+ case "5":
+ model.Status = "绉诲嚭涓�";
+ break;
default:
model.Status = "";
break;
diff --git a/Wms/WMS.IBLL/IBllAsnServer/IBllBoxInfoServer.cs b/Wms/WMS.IBLL/IBllAsnServer/IBllBoxInfoServer.cs
index 30fdad5..9a2bcc2 100644
--- a/Wms/WMS.IBLL/IBllAsnServer/IBllBoxInfoServer.cs
+++ b/Wms/WMS.IBLL/IBllAsnServer/IBllBoxInfoServer.cs
@@ -55,7 +55,7 @@
/// <param name="storeTime">鍌ㄥ瓨鏈熻嚦</param>
/// <param name="userId">鎿嶄綔浜�</param>
/// <returns></returns>
- List<BllBoxInfo> AddLabelBox(int imId, string isReset, decimal arriveQty, string productionTime, string expirationTime, string storeTime, int userId);
+ List<BllBoxInfo> AddLabelBox(int imId, string isReset, decimal arriveQty, string productionTime, string expirationTime, string storeTime, string supplierLot, int userId);
/// <summary>
/// 琛ユ墦鏍囩
diff --git a/Wms/Wms/Controllers/BllAsnController.cs b/Wms/Wms/Controllers/BllAsnController.cs
index badb7b4..3336b84 100644
--- a/Wms/Wms/Controllers/BllAsnController.cs
+++ b/Wms/Wms/Controllers/BllAsnController.cs
@@ -911,7 +911,7 @@
{
return Ok(new { code = 1, msg = "鏈幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
}
- var list = _BoxInfoSvc.AddLabelBox(model.Id, model.IsReset, decimal.Parse(model.ArriveQty), model.ProductionTime, model.ExpirationTime, model.StoreTime, int.Parse(userId));
+ var list = _BoxInfoSvc.AddLabelBox(model.Id, model.IsReset, decimal.Parse(model.ArriveQty), model.ProductionTime, model.ExpirationTime, model.StoreTime, model.SupplierLot, int.Parse(userId));
return Ok(new { code = 0, msg = "鐢熸垚绠辩爜鏍囩鎴愬姛", data = list });
}
catch (Exception e)
diff --git a/Wms/Wms/appsettings.json b/Wms/Wms/appsettings.json
index 221c91c..ac6838e 100644
--- a/Wms/Wms/appsettings.json
+++ b/Wms/Wms/appsettings.json
@@ -10,8 +10,9 @@
"AppSettings": {
//"ConnectionString": "Server=47.95.120.93;Database=WMS_JC09;User ID=sa;password=boxline!@#; Integrated Security=True;",
//"ConnectionString": "Server=47.95.120.53;Database=WMS_JC09;User ID=sa;Password=boxline!@#;Integrated Security=False;",
- "ConnectionString": "Server=127.0.0.1;Database=WMS_JC24;User ID=sa;Password=sql2019;Integrated Security=False;",
+ //"ConnectionString": "Server=127.0.0.1;Database=WMS_JC24;User ID=sa;Password=sql2019;Integrated Security=False;",
//"ConnectionString": "Server=192.168.62.200;Database=WMS_JC24;User ID=sa;Password=sql2019;Integrated Security=False;"
+ "ConnectionString": "Server=192.168.62.106;Database=WMS_JC24;User ID=sa;Password=sql2019;Integrated Security=False;"
//"ConnectionString": "Server=.;Database=WMS_JC09;User ID=sa;Password=sql2019;Integrated Security=False;"
//"ConnectionString": "Data Source=DESKTOP-0EJDG95\\MSSQLSERVER1;Initial Catalog=WMS_V01;Integrated Security=True;"
},
--
Gitblit v1.8.0