From 2d809c12abe87c21d6090ce6c5b3c75959cf4a2b Mon Sep 17 00:00:00 2001
From: chengsc <11752@DESKTOP-DS49RCP>
Date: 星期二, 24 六月 2025 09:13:48 +0800
Subject: [PATCH] Merge branch 'master' into csc
---
Wms/WMS.BLL/DataServer/DataBoxInfoServer.cs | 2
.gitignore | 1
Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs | 37
Wms/WMS.BLL/SysServer/CustomerServer.cs | 2
Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs | 26
HTML/views/ASNSetting/LabelPrintSelect.html | 16
Pda/View/AsnSetting/productEnterQuantity.html | 10
HTML/views/BaseSetting/MaterialsForm.html | 12
HTML/views/WareHouseSetting/Pallets.html | 849 ++++++++--------
Wms/Wms/Controllers/BasisController.cs | 6
HTML/views/ASNSetting/LabelBoxBuDa.html | 100 +-
HTML/views/QualityControl/QualityInformationFrom.html | 3
Wms/WMS.BLL/BllQualityServer/QualityInspectServer.cs | 79 +
Wms/WMS.IBLL/IBllAsnServer/IArrivalNoticeServer.cs | 3
Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs | 109 +
Wms/Model/ModelVm/BllAsnVm/ArrivalNoticeDetailVm.cs | 5
HTML/views/StatisticalReport/BoxInfor.html | 10
HTML/views/ASNSetting/LabelBox.html | 85
Wms/WMS.BLL/DataServer/StockServer.cs | 4
Wms/WMS.BLL/SysServer/UnitServer.cs | 2
HTML/views/ASNSetting/ArrivalNoticeDetail.html | 14
/dev/null | 57 -
Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs | 10
HTML/views/BaseSetting/Materials.html | 1127 +++++++++++-----------
Wms/WMS.BLL/SysServer/PackagServer.cs | 3
HTML/views/QualityControl/InspectionRequest.html | 225 ++--
Wms/WMS.Entity/BllAsnEntity/BllArrivalNoticeDetail.cs | 5
Wms/Model/ModelDto/BllAsnDto/LabelPrintInfoDto.cs | 31
28 files changed, 1,460 insertions(+), 1,373 deletions(-)
diff --git a/.gitignore b/.gitignore
index 78d6782..ee23276 100644
--- a/.gitignore
+++ b/.gitignore
@@ -348,3 +348,4 @@
/Wms/Wms/Logs
/鏁版嵁鏂囨。/JC26琛ㄧ粨鏋勬枃妗�.xlsx
/Wms/Wms/wwwRoot/uploads/quality
+/Wms/Wms/appsettings.json
diff --git a/HTML/views/ASNSetting/ArrivalNoticeDetail.html b/HTML/views/ASNSetting/ArrivalNoticeDetail.html
index c978bfa..7c9a7ee 100644
--- a/HTML/views/ASNSetting/ArrivalNoticeDetail.html
+++ b/HTML/views/ASNSetting/ArrivalNoticeDetail.html
@@ -658,13 +658,13 @@
}
console.log(TypeNum)
- if (TypeNum == 0) {
- layer.msg("璇疯緭鍏ユ壒娆★紒", {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- });
- return -1;
- }
+ // if (TypeNum == 0) {
+ // layer.msg("璇疯緭鍏ユ壒娆★紒", {
+ // icon: 2,
+ // time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ // });
+ // return -1;
+ // }
}
diff --git a/HTML/views/ASNSetting/LabelBox.html b/HTML/views/ASNSetting/LabelBox.html
index 472b515..0c14273 100644
--- a/HTML/views/ASNSetting/LabelBox.html
+++ b/HTML/views/ASNSetting/LabelBox.html
@@ -121,10 +121,12 @@
lay-filter="LAY-app-contlist-search">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>鎼滅储
</button>
- <button class="layui-btn layui-btn-sm layuiadmin-btn-list layui-btn-normal buDaLabelClass" style="margin-left: 5px;" lay-event="BuDaLabel" id="BuDaLabel">
+ <button class="layui-btn layui-btn-sm layuiadmin-btn-list layui-btn-normal buDaLabelClass"
+ style="margin-left: 5px;" lay-event="BuDaLabel" id="BuDaLabel">
<i class="layui-icon layui-icon-print layuiadmin-button-btn"></i>琛ユ墦鏍囩
</button>
- <button class="layui-btn layui-btn-sm layuiadmin-btn-list layui-btn-danger delLabelClass" style="margin-left: 5px;" lay-event="delLabel" id="delLabel">
+ <button class="layui-btn layui-btn-sm layuiadmin-btn-list layui-btn-danger delLabelClass"
+ style="margin-left: 5px;" lay-event="delLabel" id="delLabel">
<i class="layui-icon layui-icon-delete layuiadmin-button-btn"></i>鍒犻櫎鏍囩
</button>
<!-- <button class="layui-btn layui-btn-sm layuiadmin-btn-list layui-btn-normal " style="margin-left: 5px;" lay-event="ceshiLabel" id="ceshiLabel">
@@ -136,23 +138,24 @@
<div class="layui-inline">
<label class="layui-form-label">鍏ュ簱鍗曟嵁</label>
<div class="layui-input-inline" style="width: 220px;">
- <input type="text" id="AsnNoSelect" name="AsnNoSelect" placeholder="鍏ュ簱鍗曟嵁" autocomplete="off" class="layui-input">
-
+ <input type="text" id="AsnNoSelect" name="AsnNoSelect" placeholder="鍏ュ簱鍗曟嵁"
+ autocomplete="off" class="layui-input">
+
</div>
</div>
<div class="layui-inline DivLoadingArea" style="margin-top: 10px;">
<label class="layui-form-label">鎵规鍙�</label>
<div class="layui-input-inline" style="width: 220px;">
<select name="LotNoSelect" id="LotNoSelect" lay-search>
- <option value=""></option>
+ <option value=""></option>
</select>
</div>
- </div>
-
+ </div>
+
</div>
</div>
</div>
- <div class="layui-card-body">
+ <div class="layui-card-body">
<div class="position-relative">
<table id="Box-list" lay-filter="Box-list"></table>
@@ -228,7 +231,7 @@
}}
{{ GetBtn10(d) }}
</script>
-
+
<script type="text/html" id="templetCreateTime">
@@ -302,7 +305,7 @@
content: 'LabelBoxCeShiPrint.html',
maxmin: true,
area: ['430px', '390px'],
-
+
});
});
@@ -318,7 +321,7 @@
//鐢熸垚
$('#BuDaLabel').on('click', function () {
- layer.open({
+ layer.open({
type: 2,
title: '鎵撳嵃',
content: 'LabelBoxBuDa.html',
@@ -326,7 +329,7 @@
area: ['430px', '390px'],
// btn: ['鍙栨秷']
});
- });
+ });
$("#AsnNoSelect").on('input', function () {
if ($("#AsnNoSelect").val() == "" || $("#AsnNoSelect").val().length < 16) {
@@ -340,29 +343,29 @@
function GetLotNoByAsnNo() {
$("#LotNoSelect").empty()
- $("#LotNoSelect").append('<option value =>' + '</option>');
+ $("#LotNoSelect").append('<option value =>' + '</option>');
form.render('select');
var param = {
asnNo: $("#AsnNoSelect").val(),
};
- sendData(IP + "/BllAsn/GetLotNoListByAsn", param, 'get', function(res) {
+ sendData(IP + "/BllAsn/GetLotNoListByAsn", param, 'get', function (res) {
if (res.code == 0) { //鎴愬姛
for (var i = 0; i < res.data.length; i++) {
$("#LotNoSelect").append('<option value =' + res.data[i] + '>' + res.data[i] + '</option>');
- }
+ }
form.render('select');
} else { //涓嶆垚鍔�
layer.msg(res.msg, {
icon: 2,
time: 3000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function() {
-
+ }, function () {
+
});
- }
+ }
});
}
- //鍒犻櫎鏍囩
+ //鍒犻櫎鏍囩
$('#delLabel').on('click', function () {
layer.open({
@@ -370,20 +373,20 @@
title: '鍒犻櫎鏍囩',
content: $('#divDelLotNo'),
maxmin: false,
- area: ['350px','340px'],
+ area: ['350px', '340px'],
btn: ['纭畾', '鍙栨秷'],
- yes: function(index, layero) {
+ yes: function (index, layero) {
var param = {
AsnNo: $('#AsnNoSelect').val(),
LotNo: $('#LotNoSelect').val(),
};
- sendData(IP + "/BllAsn/DelLabelByAsnNo", param, 'post', function(res) {
+ sendData(IP + "/BllAsn/DelLabelByAsnNo", param, 'post', function (res) {
if (res.code == 0) { //鎴愬姛
bindTable();
layer.msg(res.msg, {
icon: 1,
time: 1500 //1绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function() {
+ }, function () {
$('#AsnNoSelect').val("");
$("#LotNoSelect").empty()
$("#LotNoSelect").append('<option value =>' + '</option>');
@@ -393,7 +396,7 @@
layer.msg(res.msg, {
icon: 2,
time: 3000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function() {
+ }, function () {
bindTable();
$('#AsnNoSelect').val("");
$("#LotNoSelect").empty()
@@ -405,7 +408,7 @@
});
}
});
- });
+ });
// // 鍒犻櫎绠辨敮淇℃伅
@@ -448,10 +451,10 @@
//#region 鑷畾涔夎〃澶�
var TotalColsArr = [[
- { field: 'ASNNo', title: '鍏ュ簱鍗曞彿', align: 'center',fixed: 'left', width: 180, "disabled": true },
+ { field: 'ASNNo', title: '鍏ュ簱鍗曞彿', align: 'center', fixed: 'left', width: 180, "disabled": true },
{ field: 'BoxNo', title: '绠卞彿', align: 'center', fixed: 'left', width: 220, "disabled": true },
- { field: 'BoxNo2', title: '鐩掑彿', align: 'center', fixed: 'left', width: 220, },
- { field: 'BoxNo3', title: '鏀彿', align: 'center', fixed: 'left', width: 220, "disabled": true },
+ { field: 'BoxNo2', title: '鐩掑彿', align: 'center', fixed: 'left', width: 220, },
+ { field: 'BoxNo3', title: '鏀彿', align: 'center', fixed: 'left', width: 220, },
{ field: 'SkuNo', title: '鐗╂枡缂栫爜', align: 'center', fixed: 'left', width: 140, "disabled": true },
{ field: 'SkuName', title: '鐗╂枡鍚嶇О', align: 'center', width: 240, },
{ field: 'Qty', title: '鏁伴噺', align: 'center', width: 100, },
@@ -461,18 +464,18 @@
{ field: 'LotText', title: '鎵规鎻忚堪', align: 'center', width: 165 },
{ field: 'SupplierLot', title: '渚涜揣鎵规', align: 'center', width: 155 },
{ field: 'Status', title: '鐘舵��', align: 'center', templet: '#templetStatus', width: 90 },
-
+
{ field: 'Standard', title: '瑙勬牸/鍨嬪彿', align: 'center', width: 165 },
{ field: 'PackageStandard', title: '鍖呰瑙勬牸', align: 'center', width: 165 },
{ field: 'ProductionTime', title: '鐢熶骇鏃ユ湡', align: 'center', width: 160, templet: '#templetProductionTime' },
{ field: 'ExpirationTime', title: '杩囨湡鏃ユ湡', align: 'center', width: 160, templet: '#templetExpirationTime' },
{ field: 'StoreTime', title: '鍌ㄥ瓨鏈熻嚦', align: 'center', width: 160, templet: '#templetStoreTime' },
- { field: 'CompleteTime', title: '瀹屾垚鏃ユ湡', align: 'center', width: 160, templet: '#templetCompleteTime' },
+ { field: 'CompleteTime', title: '瀹屾垚鏃ユ湡', align: 'center', width: 160, templet: '#templetCompleteTime' },
- {field: 'InspectMark',title: '鎶芥鏍囪',align: 'center',templet: '#templetInspectMark',width: 90},
- {field: 'BitBoxMark',title: '闆剁鏍囪',align: 'center',templet: '#templetBitBoxMark',width: 90},
- {field: 'Origin',title: '鏉ユ簮',align: 'center',width: 90},
+ { field: 'InspectMark', title: '鎶芥鏍囪', align: 'center', templet: '#templetInspectMark', width: 90 },
+ { field: 'BitBoxMark', title: '闆剁鏍囪', align: 'center', templet: '#templetBitBoxMark', width: 90 },
+ { field: 'Origin', title: '鏉ユ簮', align: 'center', width: 90 },
{ field: 'CreateUserName', title: '鍒涘缓浜�', align: 'center', width: 100 },
{ field: 'CreateTime', title: '鍒涘缓鏃堕棿', align: 'center', width: 160, templet: '#templetCreateTime' },
@@ -500,13 +503,13 @@
colsJson = TotalColsArr
}
var param = {
- AsnNo:$("#ASNNo").val(),
+ AsnNo: $("#ASNNo").val(),
BoxNo: $("#BoxNo").val(),
Status: $("#Status").val(),
SkuNo: $("#SkuNo").val(),
- LotNo: $("#LotNo").val(),
+ LotNo: $("#LotNo").val(),
ProductionTime: $("#ProductionTime").val(),
- SupplierLot: $("#SupplierLot").val(),
+ SupplierLot: $("#SupplierLot").val(),
};
table.render({
elem: '#Box-list',
@@ -537,8 +540,8 @@
// 鏉冮檺璁剧疆
function setRight() {
$(function () {
- $(".buDaLabelClass").hide();
- $(".delLabelClass").hide();
+ $(".buDaLabelClass").hide();
+ $(".delLabelClass").hide();
});
sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function (res) {
if (res.code == 0) { //鎴愬姛
@@ -547,12 +550,12 @@
$(function () {
$(".buDaLabelClass").show();
});
- }
+ }
if (res.data[k].MenuName == "鍒犻櫎鏍囩") {
$(function () {
$(".delLabelClass").show();
});
- }
+ }
}
} else { //涓嶆垚鍔�
layer.msg('鑾峰彇鏉冮檺淇℃伅澶辫触', {
@@ -563,7 +566,7 @@
});
}
-
+
//#region 鑷畾涔夎〃澶�
//鑷畾涔夎〃澶�
active = {
diff --git a/HTML/views/ASNSetting/LabelBoxBuDa.html b/HTML/views/ASNSetting/LabelBoxBuDa.html
index 475c72c..0e9a73b 100644
--- a/HTML/views/ASNSetting/LabelBoxBuDa.html
+++ b/HTML/views/ASNSetting/LabelBoxBuDa.html
@@ -40,10 +40,12 @@
.showCls {
display: block;
}
- .font-size12{
- font-size: 12px;
+
+ .font-size12 {
+ font-size: 14px;
}
- .font-size10{
+
+ .font-size10 {
font-size: 10px;
}
</style>
@@ -51,53 +53,49 @@
<body>
<div style="width:100%;">
- <div class="layui-form hideCls" lay-filter="layuiadmin-app-form-list" id="print" style="width: 100%;height:100%;">
+ <div class="layui-form hideCls" lay-filter="layuiadmin-app-form-list" id="print"
+ style="width: 100%;height:100%;">
<div style="display: flex;align-items: center;justify-content: center; height: 260px;">
- <table border="1" id="table" style="width: 90%; height:240px; text-align: center;border-collapse: collapse;table-layout: fixed;">
- <tr>
- <td colspan="2">
- <img src="../../img/LiNuo.jpg" style="width: 80%; height: 15px;" />
+ <table border="0" id="table"
+ style="width: 90%; height:240px;border-collapse: collapse;table-layout: fixed;border:none">
+ <tr>
+ <td class="font-size12">
+ 鐗╂枡缂栧彿锛�
+ <table id="SkuNo" class="font-size12"></table>
</td>
- <td colspan="2" style="padding: 1px 0px;" class="font-size12">SMP-ST002-R08-01</td>
- </tr>
- <tr>
- <td colspan="4" class="font-size12">鐗╂枡鏍囩</td>
</tr>
<tr>
- <td class="font-size12">鍝佸悕</td>
- <td colspan="3" id="SkuName" class="font-size10"></td>
+ <td class="font-size12">
+ 鐗╂枡鍚嶇О锛�
+ <table id="SkuName" class="font-size12"></table>
+ </td>
</tr>
<tr>
- <td class="font-size12">瑙勬牸/鍨嬪彿</td>
- <td id="Standard" class="font-size10"></td>
- <td class="font-size12">鍖呰瑙勬牸</td>
- <td id="PackageStandard" class="font-size10"></td>
+ <td class="font-size12">
+ 鎵规鍙凤細
+ <table id="LotNo" class="font-size12"></table>
+ </td>
</tr>
<tr>
- <td class="font-size12">杩涘巶缂栧彿</td>
- <td id="LotNo" class="font-size10"></td>
- <td class="font-size12">鐗╂枡浠ｇ爜</td>
- <td id="SkuNo" class="font-size10"></td>
+ <td class="font-size12">
+ 鐢熶骇鏃ユ湡锛�
+ <table id="ProductionTime" class="font-size12"></table>
+ </td>
</tr>
<tr>
- <td class="font-size12">鍘熷巶鎵瑰彿</td>
- <td id="SupplierLot" class="font-size10"></td>
- <td class="font-size12">鏁� 閲�</td>
- <td id="Qty" class="font-size10"></td>
+ <td class="font-size12">
+ 鏈夋晥鏈燂細
+ <table id="ExpirationTime" class="font-size12"></table>
+ </td>
</tr>
+
<tr>
- <td class="font-size12">鏈夋晥鏈熻嚦</td>
- <td id="ExpirationTime" class="font-size10"></td>
- <td class="font-size12">鍌ㄥ瓨鏈熻嚦</td>
- <td id="StoreTime" class="font-size10"></td>
+ <td style="padding: 5px 0px;">
+ <img id="imgBar" style=" height: 60px;" />
+ </td>
</tr>
- <tr>
- <td colspan="4" style="padding: 5px 0px;">
- <img id="imgBar" style=" height: 35px;" />
- </td>
- </tr>
-
- </table>
+
+ </table>
</div>
<div style="page-break-after: always;"></div>
</div>
@@ -135,7 +133,7 @@
class="layui-input" readonly>
</div>
</div>
-
+
<div class="layui-form-item" style="margin-bottom:0px;">
<label class="layui-form-label" style="width: 60px;">琛ユ墦绫诲瀷</label>
<div class="layui-input-inline">
@@ -236,11 +234,11 @@
// console.log(z);
$("#SkuNo").attr("id", "SkuNo" + z.toString());
$("#SkuNo" + z.toString()).html(res.data[z].SkuNo);
-
- $("#SkuName").attr("id", "SkuName" + z.toString());
- $("#SkuName" + z.toString()).html( res.data[z].SkuName);
-
+ $("#SkuName").attr("id", "SkuName" + z.toString());
+ $("#SkuName" + z.toString()).html(res.data[z].SkuName);
+
+
$("#PackageStandard").attr("id", "PackageStandard" + z.toString());
$("#PackageStandard" + z.toString()).html(res.data[z].PackageStandard);
@@ -248,24 +246,24 @@
$("#Standard" + z.toString()).html(res.data[z].Standard);
$("#Qty").attr("id", "Qty" + z.toString());
- $("#Qty" + z.toString()).html( res.data[z].Qty);
+ $("#Qty" + z.toString()).html(res.data[z].Qty);
$("#SupplierLot").attr("id", "SupplierLot" + z.toString());
- $("#SupplierLot" + z.toString()).html( res.data[z].SupplierLot);
+ $("#SupplierLot" + z.toString()).html(res.data[z].SupplierLot);
$("#LotNo").attr("id", "LotNo" + z.toString());
- $("#LotNo" + z.toString()).html( res.data[z].LotNo);
+ $("#LotNo" + z.toString()).html(res.data[z].LotNo);
$("#SupplierLot").attr("id", "SupplierLot" + z.toString());
- $("#SupplierLot" + z.toString()).html( res.data[z].SupplierLot);
+ $("#SupplierLot" + z.toString()).html(res.data[z].SupplierLot);
$("#ExpirationTime").attr("id", "ExpirationTime" + z.toString());
- $("#ExpirationTime" + z.toString()).html( formatDate2(res.data[z].ExpirationTime));
+ $("#ExpirationTime" + z.toString()).html(formatDate2(res.data[z].ExpirationTime));
-
- $("#StoreTime").attr("id", "StoreTime" + z.toString());
- $("#StoreTime" + z.toString()).html(formatDate2(res.data[z].StoreTime));
-
+
+ $("#ProductionTime").attr("id", "ProductionTime" + z.toString());
+ $("#ProductionTime" + z.toString()).html(formatDate2(res.data[z].ProductionTime));
+
$("#imgBar").attr("id", "imgBar" + z.toString());
$("#imgBar" + z.toString()).attr("src", res.data[z].ImgStr);
diff --git a/HTML/views/ASNSetting/LabelPrintSelect.html b/HTML/views/ASNSetting/LabelPrintSelect.html
index be21290..1e01304 100644
--- a/HTML/views/ASNSetting/LabelPrintSelect.html
+++ b/HTML/views/ASNSetting/LabelPrintSelect.html
@@ -122,11 +122,11 @@
});
var id = getQueryString('Id');
- var SupplierLot=getQueryString('SupplierLot');//渚涜揣鎵规
- $('#SupplierLot').val(SupplierLot);
- if(SupplierLot!='' && SupplierLot!=null &&SupplierLot!=undefined){
- $('#SupplierLot').attr('readonly', 'readonly');
- }
+ // var SupplierLot=getQueryString('SupplierLot');//渚涜揣鎵规
+ // $('#SupplierLot').val(SupplierLot);
+ // if(SupplierLot!='' && SupplierLot!=null &&SupplierLot!=undefined){
+ // $('#SupplierLot').attr('readonly', 'readonly');
+ // }
var asnType = getQueryString('Type');
console.log(asnType);
// console.log(asnType == 4);
@@ -143,7 +143,11 @@
synData(IP + "/BllAsn/GetAsnDetailQtyList", param , 'get', function (res) {
if (res.code == 0) { //鎴愬姛
- $("#arriveQty").val(res.data);
+ $("#arriveQty").val(res.data.Qty);
+ $("#productionTime").val(res.data.ProductionTime);
+ $("#expirationTime").val(res.data.ExpirationTime);
+ $("#storeTime").val(res.data.StoreTime);
+ $("#SupplierLot").val(res.data.SupplierLot);
} else { //涓嶆垚鍔�
layer.msg(res.msg, {
icon: 2,
diff --git a/HTML/views/BaseSetting/Materials.html b/HTML/views/BaseSetting/Materials.html
index 93a71ec..0d65c55 100644
--- a/HTML/views/BaseSetting/Materials.html
+++ b/HTML/views/BaseSetting/Materials.html
@@ -1,133 +1,141 @@
<!DOCTYPE html>
<html>
- <head>
- <meta charset="utf-8">
- <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">
- <link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
- <link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
- <script>
- // 杩欓噷鏄渶瑕佸湪椤甸潰娓叉煋涔嬪墠鎵ц鐨勪唬鐮�
- document.addEventListener("DOMContentLoaded", function() {
-
- //鑾峰彇table榛樿鏄剧ず鏁�
- pageCntFirst();
- });
- </script>
- </head>
- <body id="body">
- <div class="layui-fluid" style="padding-bottom: 0;">
- <div class="layui-card">
- <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>
- <div class="layui-input-inline">
- <input type="text" id="SkuNo" name="SkuNo" placeholder="璇疯緭鍏ョ墿鏂欑紪鐮�" autocomplete="off" class="layui-input">
- </div>
- </div>
- <!-- 鐗╂枡鍚嶇О -->
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 60px;">鐗╂枡鍚嶇О</label>
- <div class="layui-input-inline">
- <input type="text" id="SkuName" name="SkuName" placeholder="璇疯緭鍏ョ墿鏂欏悕绉�" autocomplete="off" class="layui-input">
- </div>
- </div>
- <div class="layui-inline">
- <!-- 瀹℃牳鐘舵�� -->
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 60px;">瀹℃牳鐘舵��</label>
- <div class="layui-input-inline">
- <select name="AuditStatusNo" id="AuditStatusNo" lay-verify="">
- <option value=""></option>
- <option value="0">寰呭鏍�</option>
- <option value="9">宸查�氳繃</option>
- </select>
- </div>
- </div>
- </div>
- <div class="layui-inline">
- <!-- 绫诲瀷 -->
- <label class="layui-form-label" style="width: 60px;">绫诲瀷</label>
- <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="1">鍖呮潗</option>
- <option value="2">鎴愬搧</option>
- <option value="3">鑰楁潗</option>
- <option value="4">涓棿鍝�</option>
- </select>
- </div>
- </div>
- <!-- 鏄惁鍙楁帶 -->
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 60px;">鏄惁鍙楁帶</label>
- <div class="layui-input-inline">
- <select name="IsControlled" id="IsControlled" lay-verify="" lay-verify="" lay-search>
- <option value=""></option>
- <option value="0">鍙楁帶</option>
- <option value="1">闈炲彈鎺�</option>
- </select>
- </div>
- </div>
- <!-- 鏄惁鍏嶆 -->
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 60px;">鏄惁鍏嶆</label>
- <div class="layui-input-inline">
- <select name="IsInspect" id="IsInspect" lay-verify="" lay-verify="" lay-search>
- <option value=""></option>
- <option value="0">鍚�</option>
- <option value="1">鏄�</option>
- </select>
- </div>
- </div>
- <!-- 瀛樺偍鐜 -->
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 60px;">瀛樺偍鐜</label>
- <div class="layui-input-inline">
- <select name="Environment" id="Environment" lay-verify="" lay-verify="" lay-search>
- <option value=""></option>
- <option value="0">甯告俯</option>
- <option value="1">浣庢俯</option>
- <!-- <option value="3">骞茬嚗閫氶</option> -->
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <!-- 鐗╂枡绫诲埆 -->
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 60px;">鐗╂枡绫诲埆</label>
- <div class="layui-input-inline">
- <select name="CategoryNo" id="CategoryNo" lay-verify="">
- <option value=""></option>
- </select>
- </div>
- </div>
- </div>
- <div class="layui-inline">
- <button class="layui-btn layui-btn-sm layuiadmin-btn-list" lay-submit lay-filter="LAY-app-contlist-search">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>鎼滅储
- </button>
- </div>
- <div class="layui-inline">
- <button class="layui-btn layui-btn-sm layuiadmin-btn-list approvalBtn" style="margin-right: 10px;" data-type="add" id="approvalBtn">
- <i class="layui-icon layuiadmin-button-btn"></i>娣诲姞
- </button>
+
+<head>
+ <meta charset="utf-8">
+ <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">
+ <link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
+ <script>
+ // 杩欓噷鏄渶瑕佸湪椤甸潰娓叉煋涔嬪墠鎵ц鐨勪唬鐮�
+ document.addEventListener("DOMContentLoaded", function () {
+
+ //鑾峰彇table榛樿鏄剧ず鏁�
+ pageCntFirst();
+ });
+ </script>
+</head>
+
+<body id="body">
+ <div class="layui-fluid" style="padding-bottom: 0;">
+ <div class="layui-card">
+ <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>
+ <div class="layui-input-inline">
+ <input type="text" id="SkuNo" name="SkuNo" placeholder="璇疯緭鍏ョ墿鏂欑紪鐮�" autocomplete="off"
+ class="layui-input">
</div>
</div>
+ <!-- 鐗╂枡鍚嶇О -->
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 60px;">鐗╂枡鍚嶇О</label>
+ <div class="layui-input-inline">
+ <input type="text" id="SkuName" name="SkuName" placeholder="璇疯緭鍏ョ墿鏂欏悕绉�" autocomplete="off"
+ class="layui-input">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <!-- 瀹℃牳鐘舵�� -->
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 60px;">瀹℃牳鐘舵��</label>
+ <div class="layui-input-inline">
+ <select name="AuditStatusNo" id="AuditStatusNo" lay-verify="">
+ <option value=""></option>
+ <option value="0">寰呭鏍�</option>
+ <option value="9">宸查�氳繃</option>
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <!-- 绫诲瀷 -->
+ <label class="layui-form-label" style="width: 60px;">绫诲瀷</label>
+ <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="1">鍖呮潗</option>
+ <option value="2">鎴愬搧</option>
+ <option value="3">鑰楁潗</option>
+ <option value="4">涓棿鍝�</option>
+ </select>
+ </div>
+ </div>
+ <!-- 鏄惁鍙楁帶 JC34 鍙樻洿涓� 鏄惁璇烽獙 -->
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 60px;">鏄惁璇烽獙</label>
+ <div class="layui-input-inline">
+ <select name="IsControlled" id="IsControlled" lay-verify="" lay-verify="" lay-search>
+ <option value=""></option>
+ <option value="0">鏄�</option>
+ <option value="1">鍚�</option>
+ </select>
+ </div>
+ </div>
+ <!-- 鏄惁鍏嶆 JC34 鍙樻洿涓� 鏄惁鍙楁帶-->
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 60px;">鏄惁鍙楁帶</label>
+ <div class="layui-input-inline">
+ <select name="IsInspect" id="IsInspect" lay-verify="" lay-verify="" lay-search>
+ <option value=""></option>
+ <option value="0">鏄�</option>
+ <option value="1">鍚�</option>
+ </select>
+ </div>
+ </div>
+ <!-- 瀛樺偍鐜 -->
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 60px;">瀛樺偍鐜</label>
+ <div class="layui-input-inline">
+ <select name="Environment" id="Environment" lay-verify="" lay-verify="" lay-search>
+ <option value=""></option>
+ <option value="0">甯告俯</option>
+ <option value="1">浣庢俯</option>
+ <!-- <option value="3">骞茬嚗閫氶</option> -->
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <!-- 鐗╂枡绫诲埆 -->
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 60px;">鐗╂枡绫诲埆</label>
+ <div class="layui-input-inline">
+ <select name="CategoryNo" id="CategoryNo" lay-verify="">
+ <option value=""></option>
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <button class="layui-btn layui-btn-sm layuiadmin-btn-list" lay-submit
+ lay-filter="LAY-app-contlist-search">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>鎼滅储
+ </button>
+ </div>
+ <div class="layui-inline">
+ <button class="layui-btn layui-btn-sm layuiadmin-btn-list approvalBtn"
+ style="margin-right: 10px;" data-type="add" id="approvalBtn">
+ <i class="layui-icon layuiadmin-button-btn"></i>娣诲姞
+ </button>
+ </div>
</div>
+ </div>
- <div id="center"></div>
+ <div id="center"></div>
- <div class="layui-card-body">
- <table id="LAY-app-content-list" lay-filter="LAY-app-content-list"></table>
-
- <!-- 瀹℃牳鐘舵�� -->
- <!-- <script type="text/html" id="buttonAuditStatusNo">
+ <div class="layui-card-body">
+ <table id="LAY-app-content-list" lay-filter="LAY-app-content-list"></table>
+
+ <!-- 瀹℃牳鐘舵�� -->
+ <!-- <script type="text/html" id="buttonAuditStatusNo">
{{# if(d.AuditStatusNo=='0'){ }}
<button class="layui-btn layui-btn-radius layui-btn-xs" style="background-color:RED;">寰呭鏍�</button>
{{# } else if(d.AuditStatusNo=='9') { }}
@@ -136,8 +144,8 @@
<button class="layui-btn layui-btn-radius layui-btn-danger layui-btn-xs" style="background-color: blue;">鍏跺畠</button>
{{# } }}
</script> -->
- <!-- 绫诲瀷 -->
- <script type="text/html" id="buttonType">
+ <!-- 绫诲瀷 -->
+ <script type="text/html" id="buttonType">
{{# if(d.Type=='0'){ }}
<p>鍘熸枡</p>
{{# } else if(d.Type=='1') { }}
@@ -151,25 +159,25 @@
{{# } }}
</script>
- <!-- 鏄惁鍙楁帶 -->
- <script type="text/html" id="buttonIsControlled">
+ <!-- 鏄惁鍙楁帶 -->
+ <script type="text/html" id="buttonIsControlled">
{{# if(d.IsControlled=='0'){ }}
<p>鍙楁帶</p>
{{# } else if(d.IsControlled=='1') { }}
<p>闈炲彈鎺�</p>
{{# } }}
</script>
-
- <!-- 鏄惁鍏嶆 -->
- <script type="text/html" id="buttonIsInspect">
+
+ <!-- 鏄惁鍏嶆 -->
+ <script type="text/html" id="buttonIsInspect">
{{# if(d.IsInspect=='0'){ }}
<p>鍚�</p>
{{# } else if(d.IsInspect=='1') { }}
<p>鏄�</p>
{{# } }}
</script>
- <!-- 鏄惁璐存爣 -->
- <script type="text/html" id="buttonIsPasteCode">
+ <!-- 鏄惁璐存爣 -->
+ <script type="text/html" id="buttonIsPasteCode">
{{# if(d.IsPasteCode=='0'){ }}
<p>鍚�</p>
{{# } else if(d.IsPasteCode=='1') { }}
@@ -177,8 +185,8 @@
{{# } }}
</script>
- <!-- 瀛樺偍鐜 -->
- <script type="text/html" id="buttonEnvironment">
+ <!-- 瀛樺偍鐜 -->
+ <script type="text/html" id="buttonEnvironment">
{{# if(d.Environment=='0'){ }}
<p>甯告俯</p>
{{# } else if(d.Environment=='1') { }}
@@ -188,7 +196,7 @@
{{# } }}
</script>
- <script type="text/html" id="table-content-list">
+ <script type="text/html" id="table-content-list">
<a class="layui-btn layui-btn-normal layui-btn-xs approvalBtnupt" lay-event="edit">
<i class="layui-icon layui-icon-edit"></i>缂栬緫
</a>
@@ -196,122 +204,74 @@
<i class="layui-icon layui-icon-delete"></i>鍒犻櫎
</a>
</script>
- </div>
</div>
</div>
- <script src="../../layuiadmin/layui/layui.js"></script>
- <script src="../../js/public.js"></script>
- <script src="../../js/jquery-3.5.1.min.js"></script>
- <script src="../../js/jquery.cookie.js"></script>
- <script>
- layui.config({
- base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
- }).extend({
- index: 'lib/index' //涓诲叆鍙ｆā鍧�
- }).use(['index', 'table', 'laypage', 'layer'], function() {
- var table = layui.table,
- form = layui.form,
- laypage = layui.laypage,
- layer = layui.layer;
+ </div>
+ <script src="../../layuiadmin/layui/layui.js"></script>
+ <script src="../../js/public.js"></script>
+ <script src="../../js/jquery-3.5.1.min.js"></script>
+ <script src="../../js/jquery.cookie.js"></script>
+ <script>
+ layui.config({
+ base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'table', 'laypage', 'layer'], function () {
+ var table = layui.table,
+ form = layui.form,
+ laypage = layui.laypage,
+ layer = layui.layer;
- var h1 = GetTableHeight();
- refreshTable("","","","","","","","");
- var tableIns;
- //鑾峰彇绫诲埆淇℃伅
- sendData(IP + "/sys/GetMaterialCategories1",{},'get',function(res){
- console.log(res)
- if (res.code == 1) //鎴愬姛
- {
- Categoryhtml = '<option value =""></option>';
- for (var i = 0; i < res.data.length; i++) {
- Categoryhtml = Categoryhtml + '<option value =' + res.data[i].CategoryNo + '>' + res.data[i].CategoryName + '</option>'
- }
- $("#CategoryNo").append(Categoryhtml);
- form.render('select');
+ var h1 = GetTableHeight();
+ refreshTable("", "", "", "", "", "", "", "");
+ var tableIns;
+ //鑾峰彇绫诲埆淇℃伅
+ sendData(IP + "/sys/GetMaterialCategories1", {}, 'get', function (res) {
+ console.log(res)
+ if (res.code == 1) //鎴愬姛
+ {
+ Categoryhtml = '<option value =""></option>';
+ for (var i = 0; i < res.data.length; i++) {
+ Categoryhtml = Categoryhtml + '<option value =' + res.data[i].CategoryNo + '>' + res.data[i].CategoryName + '</option>'
}
- })
-
- function refreshTable(SkuNo,SkuName,AuditStatusNo,Type,IsControlled,IsInspect,Environment,CategoryNo) {
- var param = {
- SkuNo: SkuNo,
- SkuName: SkuName,
- AuditStatusNo: AuditStatusNo,
- Type: Type,
- IsControlled: IsControlled,
- IsInspect: IsInspect,
- Environment: Environment,
- CategoryNo:CategoryNo
- };
-
- var url = "/Basis/GetMateList?SkuNo="+SkuNo+"&&SkuName="+SkuName+"&&AuditStatusNo="+AuditStatusNo+"&&Type="+Type+"&&IsControlled="+IsControlled+"&&IsInspect="+IsInspect+"&&Environment="+Environment+"&CategoryNo="+CategoryNo;
- sendData(IP + url, {}, 'get', function(res) {
- if (res.code == 0) //鎴愬姛
- {
- var list = res.data;
- $.extend(infoOptions, {
- data: list
- });
- infoOptions.page = {
- curr: 1
- }
- tableIns = table.render(infoOptions);
- }
- else //涓嶆垚鍔�
- {
- layer.msg('鑾峰彇鐗╂枡鍒楄〃淇℃伅澶辫触锛�', {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function() {});
- }
- });
- sendData(IP + "/basis/GetRoleRightList", {}, "get", function (res) {
- $(function () {
- $(".approvalBtn").hide();
- });
- $(function () {
- $(".approvalBtndel").hide();
- });
- $(function () {
- $(".approvalBtnupt").hide();
- });
- if (res.code == 0) //鎴愬姛
- {
- for (var k = 0; k < res.data.length; k++) {
- if (res.data[k].MenuName == "娣诲姞鐗╂枡") {
- $(function () {
- $(".approvalBtn").show();
- });
- }
- if (res.data[k].MenuName == "鍒犻櫎鐗╂枡") {
- $(function () {
- $(".approvalBtndel").show();
- });
- }
- if (res.data[k].MenuName == "缂栬緫鐗╂枡") {
- $(function () {
- $(".approvalBtnupt").show();
- });
- }
- }
- }
- else //涓嶆垚鍔�
- {
- layer.msg(
- "鑾峰彇淇℃伅澶辫触",
- {
- icon: 2,
- time: 2000, //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- },
- function () {
- //鍥炶皟
- }
- );
- }
- });
+ $("#CategoryNo").append(Categoryhtml);
+ form.render('select');
}
-
+ })
-
+ function refreshTable(SkuNo, SkuName, AuditStatusNo, Type, IsControlled, IsInspect, Environment, CategoryNo) {
+ var param = {
+ SkuNo: SkuNo,
+ SkuName: SkuName,
+ AuditStatusNo: AuditStatusNo,
+ Type: Type,
+ IsControlled: IsControlled,
+ IsInspect: IsInspect,
+ Environment: Environment,
+ CategoryNo: CategoryNo
+ };
+
+ var url = "/Basis/GetMateList?SkuNo=" + SkuNo + "&&SkuName=" + SkuName + "&&AuditStatusNo=" + AuditStatusNo + "&&Type=" + Type + "&&IsControlled=" + IsControlled + "&&IsInspect=" + IsInspect + "&&Environment=" + Environment + "&CategoryNo=" + CategoryNo;
+ sendData(IP + url, {}, 'get', function (res) {
+ if (res.code == 0) //鎴愬姛
+ {
+ var list = res.data;
+ $.extend(infoOptions, {
+ data: list
+ });
+ infoOptions.page = {
+ curr: 1
+ }
+ tableIns = table.render(infoOptions);
+ }
+ else //涓嶆垚鍔�
+ {
+ layer.msg('鑾峰彇鐗╂枡鍒楄〃淇℃伅澶辫触锛�', {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () { });
+ }
+ });
sendData(IP + "/basis/GetRoleRightList", {}, "get", function (res) {
$(function () {
$(".approvalBtn").hide();
@@ -356,354 +316,391 @@
);
}
});
-
-
- var infoOptions = {
- elem: "#LAY-app-content-list",
- height: h1,
- id: "LAY-app-content-list",
- page: true,
- limit: pageCnt,
- limits: pageLimits,
- even: true,
- cellMinWidth: 80, //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
- cols:
+ }
+
+
+
+ sendData(IP + "/basis/GetRoleRightList", {}, "get", function (res) {
+ $(function () {
+ $(".approvalBtn").hide();
+ });
+ $(function () {
+ $(".approvalBtndel").hide();
+ });
+ $(function () {
+ $(".approvalBtnupt").hide();
+ });
+ if (res.code == 0) //鎴愬姛
+ {
+ for (var k = 0; k < res.data.length; k++) {
+ if (res.data[k].MenuName == "娣诲姞鐗╂枡") {
+ $(function () {
+ $(".approvalBtn").show();
+ });
+ }
+ if (res.data[k].MenuName == "鍒犻櫎鐗╂枡") {
+ $(function () {
+ $(".approvalBtndel").show();
+ });
+ }
+ if (res.data[k].MenuName == "缂栬緫鐗╂枡") {
+ $(function () {
+ $(".approvalBtnupt").show();
+ });
+ }
+ }
+ }
+ else //涓嶆垚鍔�
+ {
+ layer.msg(
+ "鑾峰彇淇℃伅澶辫触",
+ {
+ icon: 2,
+ time: 2000, //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ },
+ function () {
+ //鍥炶皟
+ }
+ );
+ }
+ });
+
+
+ var infoOptions = {
+ elem: "#LAY-app-content-list",
+ height: h1,
+ id: "LAY-app-content-list",
+ page: true,
+ limit: pageCnt,
+ limits: pageLimits,
+ even: true,
+ cellMinWidth: 80, //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
+ cols:
[[
{
- title: '搴忓彿',type: 'numbers',fixed: 'left',width:65
+ title: '搴忓彿', type: 'numbers', fixed: 'left', width: 65
},
{
- field: 'SkuNo',title: '鐗╂枡缂栫爜',align: 'center',fixed: 'left',width: 100
- },
- {
- field: 'SkuName',title: '鐗╂枡鍚嶇О',align: 'center',width: 150
- },
- {
- field: 'Standard',title: '鐗╂枡瑙勬牸',align: 'center',width: 130
- },
-
- {
- field: 'Type',title: '绫诲瀷',align: 'center',templet: '#buttonType',width: 100
+ field: 'SkuNo', title: '鐗╂枡缂栫爜', align: 'center', fixed: 'left', width: 100
},
{
- field: 'IsControlled',templet: '#buttonIsControlled',title: '鏄惁鍙楁帶',align: 'center',width: 100
- },
- {
- field: 'IsInspect',title: '鏄惁鍏嶆',align: 'center',templet: '#buttonIsInspect',width: 100
- },
- {
- field: 'IsPasteCode',title: '鏄惁璐存爣',align: 'center',templet: '#buttonIsPasteCode',width: 100
- },
- {
- field: 'Origin',title: '鏉ユ簮',align: 'center',width: 200
- },
- {
- field: 'UnitNo',title: '鍗曚綅',align: 'center',width: 100
+ field: 'SkuName', title: '鐗╂枡鍚嶇О', align: 'center', width: 150
},
{
- field: 'PackagName',title: '鍖呰',align: 'center',width: 100
+ field: 'Standard', title: '鐗╂枡瑙勬牸', align: 'center', width: 130
+ },
+
+ {
+ field: 'Type', title: '绫诲瀷', align: 'center', templet: '#buttonType', width: 100
},
{
- field: 'Environment',title: '瀛樺偍鐜',align: 'center',templet: '#buttonEnvironment',width: 120
+ field: 'IsControlled', templet: '#buttonIsControlled', title: '鏄惁鍙楁帶', align: 'center', width: 100
},
{
- field: 'CategoryName',title: '鐗╂枡绫诲埆',align: 'center',width: 120
+ field: 'IsInspect', title: '鏄惁鍏嶆', align: 'center', templet: '#buttonIsInspect', width: 100
},
{
- field: 'Weight',title: '鐞嗚閲嶉噺',align: 'center',width: 135
- },
- {
- field: 'Warranty',title: '淇濊川鏈�(澶�)',align: 'center',width: 140
- },
- {
- field: 'UnpackWarranty',title: '鎷嗗寘鏁堟湡(澶�)',align: 'center',width: 140
- },
-
- {
- field: 'AdventTime',title: '涓存湡(澶�)',align: 'center',width: 140
+ field: 'IsPasteCode', title: '鏄惁璐存爣', align: 'center', templet: '#buttonIsPasteCode', width: 100
},
{
- field: 'LowInventory',title: '浣庡簱瀛�',align: 'center',width: 150
+ field: 'Origin', title: '鏉ユ簮', align: 'center', width: 200
},
{
- field: 'Demo',title: '澶囨敞',align: 'center',width: 200
+ field: 'UnitNo', title: '鍗曚綅', align: 'center', width: 100
},
{
- field: 'CreateUserName',title: '鍒涘缓浜�',align: 'center',width: 130
+ field: 'PackagName', title: '鍖呰', align: 'center', width: 100
},
{
- field: 'CreateTime',title: '鍒涘缓鏃ユ湡',align: 'center',width: 170,
+ field: 'Environment', title: '瀛樺偍鐜', align: 'center', templet: '#buttonEnvironment', width: 120
+ },
+ {
+ field: 'CategoryName', title: '鐗╂枡绫诲埆', align: 'center', width: 120
+ },
+ {
+ field: 'Weight', title: '鐞嗚閲嶉噺', align: 'center', width: 135
+ },
+ {
+ field: 'Warranty', title: '淇濊川鏈�(澶�)', align: 'center', width: 140
+ },
+ {
+ field: 'UnpackWarranty', title: '鎷嗗寘鏁堟湡(澶�)', align: 'center', width: 140
+ },
+
+ {
+ field: 'AdventTime', title: '涓存湡(澶�)', align: 'center', width: 140
+ },
+ {
+ field: 'LowInventory', title: '浣庡簱瀛�', align: 'center', width: 150
+ },
+ {
+ field: 'Demo', title: '澶囨敞', align: 'center', width: 200
+ },
+ {
+ field: 'CreateUserName', title: '鍒涘缓浜�', align: 'center', width: 130
+ },
+ {
+ field: 'CreateTime', title: '鍒涘缓鏃ユ湡', align: 'center', width: 170,
templet: function (d) {
return formatDate(d.CreateTime);
}
},
{
- title: '鎿嶄綔',fixed: 'right',align: 'center',toolbar: '#table-content-list',width: 170
+ title: '鎿嶄綔', fixed: 'right', align: 'center', toolbar: '#table-content-list', width: 170
}
]],
+ };
+
+ //鐩戝惉鎼滅储
+ form.on('submit(LAY-app-contlist-search)', function (data) {
+ var SkuNo = data.field.SkuNo;
+ var SkuName = data.field.SkuName;
+ var AuditStatusNo = data.field.AuditStatusNo;
+ var Type = data.field.Type;
+ var IsControlled = data.field.IsControlled;
+ var IsInspect = data.field.IsInspect;
+ var Environment = data.field.Environment;
+ var CategoryNo = data.field.CategoryNo;
+
+ refreshTable(SkuNo, SkuName, AuditStatusNo, Type, IsControlled, IsInspect, Environment, CategoryNo);
+ });
+ var doing = true;
+ var $ = layui.$,
+ active = {
+ //鏂板
+ add: function () {
+ layer.open({
+ type: 2,
+ title: '娣诲姞鐗╂枡淇℃伅',
+ content: 'MaterialsForm.html',
+ maxmin: true,
+ area: ['640px', '746px'],
+ btn: ['纭畾', '鍙栨秷'],
+ yes: function (index, layero) {
+ var iframeWindow = window['layui-layer-iframe' + index],
+ submitID = 'layuiadmin-app-form-submit',
+ submit = layero.find('iframe').contents().find('#' + submitID);
+ //鐩戝惉鎻愪氦
+ iframeWindow.layui.form.on('submit(' + submitID + ')', function (
+ data) {
+ var field = data.field; //鑾峰彇鎻愪氦鐨勫瓧娈�
+ //鎻愪氦 Ajax 鎴愬姛鍚庯紝闈欐�佹洿鏂拌〃鏍间腑鐨勬暟鎹�
+ var param = {
+ SkuNo: field.SkuNo,
+ SkuName: field.SkuName,
+ Standard: field.Standard,
+ //AuditStatusNo: field.AuditStatusNo,
+ Type: field.Type,
+ IsControlled: field.IsControlled,
+ IsInspect: field.IsInspect,
+ IsPasteCode: field.IsPasteCode,
+ Origin: field.Origin,
+ CategoryNo: field.CategoryNo,
+ UnitNo: field.UnitNo,
+ PackagNo: field.PackagNo,
+ Environment: field.Environment,
+ Weight: Number(field.Weight),
+ Warranty: Number(field.Warranty),
+ UnpackWarranty: Number(field.UnpackWarranty),
+ Price: Number(field.Price),
+ AdventTime: Number(field.AdventTime), //涓存湡
+ LowInventory: Number(field.LowInventory), //浣庡簱瀛�
+ Demo: field.Demo
+ };
+ if (doing) {
+ doing = false;
+ sendData(IP + "/Basis/AddMate", param, 'post', function (res) {
+ console.log(res);
+ if (res.code == 0) { //鎴愬姛
+ layer.msg(res.msg, {
+ icon: 1,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () {
+ layer.close(index); //鍏抽棴寮瑰眰
+ refreshTable
+ (
+ $("#SkuNo").val(),
+ $("#SkuName").val(),
+ $("#AuditStatusNo").val(),
+ $("#Type").val(),
+ $("#IsControlled").val(),
+ $("#IsInspect").val(),
+ $("#Environment").val(),
+ $("#CategoryNo").val()
+ );
+ doing = true;
+ });
+ }
+ else if (res.code == 2) {
+ layer.msg("鐗╂枡缂栫爜鎴栧悕绉伴噸澶嶏紝娣诲姞澶辫触锛�", {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () { doing = true; });
+ }
+ else //涓嶆垚鍔�
+ {
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () { doing = true; });
+ }
+ });
+ }
+ else {
+ console.log(123);
+ }
+
+ });
+ submit.trigger('click');
+ }
+ });
+ }
};
-
- //鐩戝惉鎼滅储
- form.on('submit(LAY-app-contlist-search)', function(data) {
- var SkuNo = data.field.SkuNo;
- var SkuName = data.field.SkuName;
- var AuditStatusNo = data.field.AuditStatusNo;
- var Type = data.field.Type;
- var IsControlled = data.field.IsControlled;
- var IsInspect = data.field.IsInspect;
- var Environment = data.field.Environment;
- var CategoryNo = data.field.CategoryNo;
-
- refreshTable(SkuNo,SkuName,AuditStatusNo,Type,IsControlled,IsInspect,Environment,CategoryNo);
- });
- var doing = true;
- var $ = layui.$,
- active = {
- //鏂板
- add: function() {
- layer.open({
- type: 2,
- title: '娣诲姞鐗╂枡淇℃伅',
- content: 'MaterialsForm.html',
- maxmin: true,
- area: ['640px', '746px'],
- btn: ['纭畾', '鍙栨秷'],
- yes: function(index, layero) {
- var iframeWindow = window['layui-layer-iframe' + index],
- submitID = 'layuiadmin-app-form-submit',
- submit = layero.find('iframe').contents().find('#' + submitID);
- //鐩戝惉鎻愪氦
- iframeWindow.layui.form.on('submit(' + submitID + ')', function(
- data) {
- var field = data.field; //鑾峰彇鎻愪氦鐨勫瓧娈�
- //鎻愪氦 Ajax 鎴愬姛鍚庯紝闈欐�佹洿鏂拌〃鏍间腑鐨勬暟鎹�
- var param = {
- SkuNo: field.SkuNo,
- SkuName: field.SkuName,
- Standard: field.Standard,
- //AuditStatusNo: field.AuditStatusNo,
- Type: field.Type,
- IsControlled: field.IsControlled,
- IsInspect: field.IsInspect,
- IsPasteCode: field.IsPasteCode,
- Origin: field.Origin,
- CategoryNo: field.CategoryNo,
- UnitNo: field.UnitNo,
- PackagNo: field.PackagNo,
- Environment: field.Environment,
- Weight: Number(field.Weight),
- Warranty: Number(field.Warranty),
- UnpackWarranty: Number(field.UnpackWarranty),
- Price: Number(field.Price),
- AdventTime: Number(field.AdventTime), //涓存湡
- LowInventory: Number(field.LowInventory), //浣庡簱瀛�
- Demo: field.Demo
- };
- if(doing)
- {
- doing = false;
- sendData(IP + "/Basis/AddMate", param, 'post',function(res) {
- console.log(res);
- if (res.code == 0) { //鎴愬姛
- layer.msg(res.msg, {
- icon: 1,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function() {
- layer.close(index); //鍏抽棴寮瑰眰
- refreshTable
- (
- $("#SkuNo").val(),
- $("#SkuName").val(),
- $("#AuditStatusNo").val(),
- $("#Type").val(),
- $("#IsControlled").val(),
- $("#IsInspect").val(),
- $("#Environment").val(),
- $("#CategoryNo").val()
- );
- doing = true;
- });
- }
- else if (res.code == 2) {
- layer.msg("鐗╂枡缂栫爜鎴栧悕绉伴噸澶嶏紝娣诲姞澶辫触锛�", {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function() {doing = true;});
- }
- else //涓嶆垚鍔�
- {
- layer.msg(res.msg, {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function() {doing = true;});
- }
- });
- }
- else{
- console.log(123);
- }
-
- });
- submit.trigger('click');
- }
- });
- }
- };
- $('.layui-btn.layuiadmin-btn-list').on('click', function() {
- var type = $(this).data('type');
- active[type] ? active[type].call(this) : '';
- });
+ $('.layui-btn.layuiadmin-btn-list').on('click', function () {
+ var type = $(this).data('type');
+ active[type] ? active[type].call(this) : '';
+ });
- var element = layui.element;
- var houseId = 0;
- var param = {
- Id: $.cookie('userId')
- }
- var xml = '';
- function getchiled(data, mainId) {
- if (data)
- {
- var list = data.filter(item => item.ParentId == mainId);
- if (list)
- {
- for (var i = 0; i < list.length; i++)
- {
- var id = list[i].Id;
- //鏌ヨ鏈夋棤瀛愯彍鍗�
- var count = data.filter(item => item.ParentId == id).length;
- if (count > 0)
- {
- xml = xml + '<dd>' + '<a href="javascript:;">' + list[i].Name + '</a>' + '<dl class="layui-nav-child">';
- getchiled(data, id);
- xml = xml + '</dl></dd>';
- }
- else
- {
- xml = xml + '<dd>' + '<a lay-href="' + list[i].Url + '">' + list[i].Name + '</a>' + '</dd>';
- }
+ var element = layui.element;
+ var houseId = 0;
+ var param = {
+ Id: $.cookie('userId')
+ }
+ var xml = '';
+ function getchiled(data, mainId) {
+ if (data) {
+ var list = data.filter(item => item.ParentId == mainId);
+ if (list) {
+ for (var i = 0; i < list.length; i++) {
+ var id = list[i].Id;
+ //鏌ヨ鏈夋棤瀛愯彍鍗�
+ var count = data.filter(item => item.ParentId == id).length;
+ if (count > 0) {
+ xml = xml + '<dd>' + '<a href="javascript:;">' + list[i].Name + '</a>' + '<dl class="layui-nav-child">';
+ getchiled(data, id);
+ xml = xml + '</dl></dd>';
+ }
+ else {
+ xml = xml + '<dd>' + '<a lay-href="' + list[i].Url + '">' + list[i].Name + '</a>' + '</dd>';
}
}
}
}
- var uid = $.cookie('userId');
- table.on('tool(LAY-app-content-list)', function(obj) {
- var data = obj.data;
- //鍒犻櫎
- if (obj.event === 'del')
- {
- layer.confirm('纭畾鍒犻櫎閫変腑鐨勭墿鏂欙紵', function(index) {
- cusid = data.Id;
- var arr = [];
- arr.push(cusid); //灞炴��
- var param = {
- Ids: arr
- };
- if(doing)
- {
- doing = false;
- sendData(IP + "/Basis/DelMate?Id="+data.Id+"", {} , 'get', function(res) {
- console.log(res);
- if (res.code == 0) { //鎴愬姛
- layer.msg(res.msg, {
- icon: 1,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function() {
- refreshTable
- (
- $("#SkuNo").val(),
- $("#SkuName").val(),
- $("#AuditStatusNo").val(),
- $("#Type").val(),
- $("#IsControlled").val(),
- $("#IsInspect").val(),
- $("#Environment").val(),
- $("#CategoryNo").val()
- );
- //table.reload('LAY-app-content-list'); //鏁版嵁鍒锋柊
- doing = true;
- });
- }
- else //涓嶆垚鍔�
- {
- layer.msg(res.msg, {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function() {doing = true;});
- }
- });
- }
- else
- {
- console.log(123);
- }
- });
- }
- //缂栬緫
- else if (obj.event === 'edit')
- {
- cusId = data.Id;
- layer.open({
- type: 2,
- title: '缂栬緫鐗╂枡淇℃伅',
- content: 'MaterialsForm.html?id=' + cusId,
- maxmin: true,
- area: ['640px', '746px'],
- btn: ['纭畾', '鍙栨秷'],
- yes: function(index, layero) {
- var iframeWindow = window['layui-layer-iframe' + index],
- submitID = 'layuiadmin-app-form-edit',
- submit = layero.find('iframe').contents().find('#' + submitID);
- //鐩戝惉鎻愪氦
- iframeWindow.layui.form.on('submit(' + submitID + ')', function(data) {
- var field = data.field; //鑾峰彇鎻愪氦鐨勫瓧娈�
- //鎻愪氦 Ajax 鎴愬姛鍚庯紝闈欐�佹洿鏂拌〃鏍间腑鐨勬暟鎹�
- var param = {
- Id: cusId,
- SkuNo: field.SkuNo,
- SkuName: field.SkuName,
- Standard: field.Standard,
- AuditStatusNo: field.AuditStatusNo,
- Type: field.Type,
- IsControlled: field.IsControlled,
- IsInspect: field.IsInspect,
- IsPasteCode: field.IsPasteCode,
- Origin: field.Origin,
- CategoryNo: field.CategoryNo,
- UnitNo: field.UnitNo,
- PackagNo: field.PackagNo,
- Environment: field.Environment,
- Weight: Number(field.Weight),
- Warranty: Number(field.Warranty),
- UnpackWarranty: Number(field.UnpackWarranty),
- Price: Number(field.Price),
- AdventTime: Number(field.AdventTime), //涓存湡
- LowInventory: Number(field.LowInventory), //浣庡簱瀛�
- Demo: field.Demo
- };
- if(doing)
- {
- doing = false;
- sendData(IP + "/Basis/ExitMate", param, 'post',
- function(res) {
+ }
+ var uid = $.cookie('userId');
+ table.on('tool(LAY-app-content-list)', function (obj) {
+ var data = obj.data;
+ //鍒犻櫎
+ if (obj.event === 'del') {
+ layer.confirm('纭畾鍒犻櫎閫変腑鐨勭墿鏂欙紵', function (index) {
+ cusid = data.Id;
+ var arr = [];
+ arr.push(cusid); //灞炴��
+ var param = {
+ Ids: arr
+ };
+ if (doing) {
+ doing = false;
+ sendData(IP + "/Basis/DelMate?Id=" + data.Id + "", {}, 'get', function (res) {
+ console.log(res);
+ if (res.code == 0) { //鎴愬姛
+ layer.msg(res.msg, {
+ icon: 1,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () {
+ refreshTable
+ (
+ $("#SkuNo").val(),
+ $("#SkuName").val(),
+ $("#AuditStatusNo").val(),
+ $("#Type").val(),
+ $("#IsControlled").val(),
+ $("#IsInspect").val(),
+ $("#Environment").val(),
+ $("#CategoryNo").val()
+ );
+ //table.reload('LAY-app-content-list'); //鏁版嵁鍒锋柊
+ doing = true;
+ });
+ }
+ else //涓嶆垚鍔�
+ {
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () { doing = true; });
+ }
+ });
+ }
+ else {
+ console.log(123);
+ }
+ });
+ }
+ //缂栬緫
+ else if (obj.event === 'edit') {
+ cusId = data.Id;
+ layer.open({
+ type: 2,
+ title: '缂栬緫鐗╂枡淇℃伅',
+ content: 'MaterialsForm.html?id=' + cusId,
+ maxmin: true,
+ area: ['640px', '746px'],
+ btn: ['纭畾', '鍙栨秷'],
+ yes: function (index, layero) {
+ var iframeWindow = window['layui-layer-iframe' + index],
+ submitID = 'layuiadmin-app-form-edit',
+ submit = layero.find('iframe').contents().find('#' + submitID);
+ //鐩戝惉鎻愪氦
+ iframeWindow.layui.form.on('submit(' + submitID + ')', function (data) {
+ var field = data.field; //鑾峰彇鎻愪氦鐨勫瓧娈�
+ //鎻愪氦 Ajax 鎴愬姛鍚庯紝闈欐�佹洿鏂拌〃鏍间腑鐨勬暟鎹�
+ var param = {
+ Id: cusId,
+ SkuNo: field.SkuNo,
+ SkuName: field.SkuName,
+ Standard: field.Standard,
+ AuditStatusNo: field.AuditStatusNo,
+ Type: field.Type,
+ IsControlled: field.IsControlled,
+ IsInspect: field.IsInspect,
+ IsPasteCode: field.IsPasteCode,
+ Origin: field.Origin,
+ CategoryNo: field.CategoryNo,
+ UnitNo: field.UnitNo,
+ PackagNo: field.PackagNo,
+ Environment: field.Environment,
+ Weight: Number(field.Weight),
+ Warranty: Number(field.Warranty),
+ UnpackWarranty: Number(field.UnpackWarranty),
+ Price: Number(field.Price),
+ AdventTime: Number(field.AdventTime), //涓存湡
+ LowInventory: Number(field.LowInventory), //浣庡簱瀛�
+ Demo: field.Demo
+ };
+ if (doing) {
+ doing = false;
+ sendData(IP + "/Basis/ExitMate", param, 'post',
+ function (res) {
if (res.code == 0) //鎴愬姛
{
layer.msg("淇敼鎴愬姛", {
icon: 1,
time: 1000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function() {
+ }, function () {
layer.close(index); //鍏抽棴寮瑰眰
refreshTable
- (
- $("#SkuNo").val(),
- $("#SkuName").val(),
- $("#AuditStatusNo").val(),
- $("#Type").val(),
- $("#IsControlled").val(),
- $("#IsInspect").val(),
- $("#Environment").val(),
- $("#CategoryNo").val(),
- );
+ (
+ $("#SkuNo").val(),
+ $("#SkuName").val(),
+ $("#AuditStatusNo").val(),
+ $("#Type").val(),
+ $("#IsControlled").val(),
+ $("#IsInspect").val(),
+ $("#Environment").val(),
+ $("#CategoryNo").val(),
+ );
doing = true;
});
}
@@ -712,21 +709,21 @@
layer.msg(res.msg, {
icon: 2,
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function() {doing = true;});
+ }, function () { doing = true; });
}
});
- }
- else
- {
- console.log(123);
- }
- });
- submit.trigger('click');
- }
- });
- }
- });
+ }
+ else {
+ console.log(123);
+ }
+ });
+ submit.trigger('click');
+ }
+ });
+ }
});
- </script>
- </body>
-</html>
+ });
+ </script>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/HTML/views/BaseSetting/MaterialsForm.html b/HTML/views/BaseSetting/MaterialsForm.html
index b39edbe..3c61be9 100644
--- a/HTML/views/BaseSetting/MaterialsForm.html
+++ b/HTML/views/BaseSetting/MaterialsForm.html
@@ -93,22 +93,22 @@
</div>
</div>
<div class="layui-inline" id="IsControlledshow">
- <label class="layui-form-label">鏄惁鍙楁帶</label>
+ <label class="layui-form-label">鏄惁璇烽獙</label>
<div class="layui-input-block" style="width: 182px;">
<select name="IsControlled" id="IsControlled" lay-verify="" lay-verify="" lay-search>
<!-- <option value=""></option> -->
- <option value="0">鍙楁帶</option>
- <option value="1">闈炲彈鎺�</option>
+ <option value="0">鏄�</option>
+ <option value="1">鍚�</option>
</select>
</div>
</div>
<div class="layui-inline" id="IsInspectshow">
- <label class="layui-form-label">鏄惁鍏嶆</label>
+ <label class="layui-form-label">鏄惁鍙楁帶</label>
<div class="layui-input-block" style="width: 182px;">
<select name="IsInspect" id="IsInspect" lay-verify="" lay-verify="" lay-search>
<!-- <option value=""></option> -->
- <option value="0">鍚�</option>
- <option value="1">鏄�</option>
+ <option value="0">鏄�</option>
+ <option value="1">鍚�</option>
</select>
</div>
</div>
diff --git a/HTML/views/QualityControl/InspectionRequest.html b/HTML/views/QualityControl/InspectionRequest.html
index b452057..54c6286 100644
--- a/HTML/views/QualityControl/InspectionRequest.html
+++ b/HTML/views/QualityControl/InspectionRequest.html
@@ -23,12 +23,11 @@
display: none;
}
- /* 鏍峰紡鐢ㄤ簬缇庡寲鍥剧墖灞曠ず */
- .layui-table-cell img {
- max-width: 100px;
- max-height: 100px;
- }
-
+ /* 鏍峰紡鐢ㄤ簬缇庡寲鍥剧墖灞曠ず */
+ .layui-table-cell img {
+ max-width: 100px;
+ max-height: 100px;
+ }
</style>
<script>
// 杩欓噷鏄渶瑕佸湪椤甸潰娓叉煋涔嬪墠鎵ц鐨勪唬鐮�
@@ -130,10 +129,11 @@
<div style="display: none;" id="UploadImageView">
- <div id="UploadImage" style="margin-left: 35px;margin-top: 30px;">
- <label>涓婁紶鍥剧墖:</label><button type="button" class="layui-btn" id="uploadBtn" style="margin-left: 20px;" >娴忚</button>
+ <div id="UploadImage" style="margin-left: 35px;margin-top: 30px;">
+ <label>涓婁紶鍥剧墖:</label><button type="button" class="layui-btn" id="uploadBtn"
+ style="margin-left: 20px;">娴忚</button>
<button type="button" class="layui-btn" id="upload" style="margin-left: 20px;">涓婁紶</button>
-
+
</div>
</div>
@@ -311,14 +311,14 @@
base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index' //涓诲叆鍙ｆā鍧�
- }).use(['index', 'table', 'laypage', 'element', 'layer', 'laydate','upload'], function () {
+ }).use(['index', 'table', 'laypage', 'element', 'layer', 'laydate', 'upload'], function () {
var table = layui.table,
form = layui.form,
element = layui.element,
laypage = layui.laypage,
layer = layui.layer,
laydate = layui.laydate,
- upload = layui.upload;
+ upload = layui.upload;
var h1 = GetTableTabHeight();
laydate.render({
elem: '#StartTime'
@@ -404,8 +404,11 @@
{ field: 'Status', title: '鎵ц鐘舵��', align: 'center', width: 90, templet: '#templetStatus' },
{ field: 'RequestTime', title: '璇烽獙鏃ユ湡', align: 'center', width: 165, templet: '#templetCompleteTime' },
{ field: 'RequestUser', title: '璇烽獙浜�', align: 'center', width: 165 },
- { field: 'UDF5', title: '鍥剧墖', align: 'center', width: 100 ,templet: function (d) {
- return d.image ? '<img src="' + d.image + '" alt="鍥剧墖">' : '鏃犲浘鐗�';}},
+ {
+ field: 'UDF5', title: '鍥剧墖', align: 'center', width: 100, templet: function (d) {
+ return d.image ? '<img src="' + d.image + '" alt="鍥剧墖">' : '鏃犲浘鐗�';
+ }
+ },
// { field: 'UDF2', title: '鑷畾涔�2', align: 'center', width: 100 },
// { field: 'UDF3', title: '鑷畾涔�3', align: 'center', width: 100 },
// { field: 'UDF4', title: '鑷畾涔�4', align: 'center', width: 100 },
@@ -488,7 +491,7 @@
sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function (res) {
if (res.code == 0) { //鎴愬姛
for (var k = 0; k < res.data.length; k++) {
-
+
if (res.data[k].MenuName == "涓婁紶") {
$(function () {
$(".shangClass").show();
@@ -535,64 +538,64 @@
var data = obj.data;
switch (obj.event) {
case "upImage":
- layer.open({
- type:1,
- title: '涓婁紶鍥剧墖',
- content: $('#UploadImageView'),
- maxmin: true,
- area: ['350px','215px'],
- btn: ['纭畾'],
- success: function(index, layero){
- upload.render({
- elem: '#uploadBtn',
- url: IP + '/BllQuality/UploadImage',
- accept: 'images',
- exts:'jpg|png|gif',
- multiple: false,
- size: 1024 * 5, // 5MB
- auto: false,
- bindAction: '#upload',
- headers: { ToKen: $.cookie('token') },
- xhrFields: {
- withCredentials: true // 鎼哄甫cookie
- },
- before: function(){
- this.data = {
- qualityId:data.Id
- };
- layer.load(1, {shade: [0.5, '#000']});
- },
- done: function(res){
+ layer.open({
+ type: 1,
+ title: '涓婁紶鍥剧墖',
+ content: $('#UploadImageView'),
+ maxmin: true,
+ area: ['350px', '215px'],
+ btn: ['纭畾'],
+ success: function (index, layero) {
+ upload.render({
+ elem: '#uploadBtn',
+ url: IP + '/BllQuality/UploadImage',
+ accept: 'images',
+ exts: 'jpg|png|gif',
+ multiple: false,
+ size: 1024 * 5, // 5MB
+ auto: false,
+ bindAction: '#upload',
+ headers: { ToKen: $.cookie('token') },
+ xhrFields: {
+ withCredentials: true // 鎼哄甫cookie
+ },
+ before: function () {
+ this.data = {
+ qualityId: data.Id
+ };
+ layer.load(1, { shade: [0.5, '#000'] });
+ },
+ done: function (res) {
layer.closeAll('loading');
- if(res.code == 0){
- layer.msg('涓婁紶鎴愬姛', {icon: 1});
+ if (res.code == 0) {
+ layer.msg('涓婁紶鎴愬姛', { icon: 1 });
// 涓婁紶鎴愬姛鍚庣殑鍥炶皟锛屽鍒锋柊琛ㄦ牸绛�
// table.reload('LAY-app-content-list');
} else {
- layer.msg(res.msg || '涓婁紶澶辫触', {icon: 2});
+ layer.msg(res.msg || '涓婁紶澶辫触', { icon: 2 });
}
- },
- error: function(){
+ },
+ error: function () {
layer.closeAll('loading');
- layer.msg('涓婁紶澶辫触', {icon: 2});
- }
- });
- }
- });
- break;
- case "ViewImage":
- layer.open({
- type:1,
- title: '鏌ョ湅鍥剧墖',
- content: $('#ImagesShowView'),
- maxmin: true,
- area: ['650px','315px'],
- btn: ['纭畾'],
- success: function(index, layero){
- getImage(data.Id);
+ layer.msg('涓婁紶澶辫触', { icon: 2 });
}
});
- break;
+ }
+ });
+ break;
+ case "ViewImage":
+ layer.open({
+ type: 1,
+ title: '鏌ョ湅鍥剧墖',
+ content: $('#ImagesShowView'),
+ maxmin: true,
+ area: ['650px', '315px'],
+ btn: ['纭畾'],
+ success: function (index, layero) {
+ getImage(data.Id);
+ }
+ });
+ break;
case "add":
layer.confirm('纭畾瑕佸彂璧疯楠岋紵', function (index) {
var param = {
@@ -725,54 +728,54 @@
}
});
- function getImage(id)
- {
- var param = {
- Id:id
- }
- sendData(IP + "/BllQuality/GetImage", param, 'post', function (res) {
- if (res.code == 0) { //鎴愬姛
- $("#ImagesShow").html('');
- res.data.forEach(function (item) {
- $("#ImagesShow").append('<div>'+
- '<a href='+item+' target="_blank" class="image-item"><img src="'+ item + '" /></a>'+
- '<button class="layui-btn layui-btn-primary layui-btn-sm delete-btn" data-type="customCols" data_Url='+item+' >鍒犻櫎</button>'+
- '</div>');
- })
- $('.delete-btn').on('click', function ( ) {
- var item = $(this);
- var QualityId = id;
- var imageUrl = item.attr('data_Url');
- layer.confirm('纭畾鍒犻櫎鍚楋紵', function (index) {
- var param = {
- QualityId: QualityId,
- ImageUrl: imageUrl
- }
- sendData(IP + "/BllQuality/DeleteImage", param, 'post', function (res) {
- if (res.code == 0) { //鎴愬姛
- layer.msg(res.msg, {
- icon: 1,
- time: 1000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function () {
- getImage(id);
- });
- } else {
- layer.msg(res.msg, {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- });
- }
- });
- })});
- } else { //涓嶆垚鍔�
- $("#ImagesShow").html('');
- res.msg, {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }
- }
- })
+ function getImage(id) {
+ var param = {
+ Id: id
}
+ sendData(IP + "/BllQuality/GetImage", param, 'post', function (res) {
+ if (res.code == 0) { //鎴愬姛
+ $("#ImagesShow").html('');
+ res.data.forEach(function (item) {
+ $("#ImagesShow").append('<div>' +
+ '<a href=' + item + ' target="_blank" class="image-item"><img src="' + item + '" /></a>' +
+ '<button class="layui-btn layui-btn-primary layui-btn-sm delete-btn" data-type="customCols" data_Url=' + item + ' >鍒犻櫎</button>' +
+ '</div>');
+ })
+ $('.delete-btn').on('click', function () {
+ var item = $(this);
+ var QualityId = id;
+ var imageUrl = item.attr('data_Url');
+ layer.confirm('纭畾鍒犻櫎鍚楋紵', function (index) {
+ var param = {
+ QualityId: QualityId,
+ ImageUrl: imageUrl
+ }
+ sendData(IP + "/BllQuality/DeleteImage", param, 'post', function (res) {
+ if (res.code == 0) { //鎴愬姛
+ layer.msg(res.msg, {
+ icon: 1,
+ time: 1000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () {
+ getImage(id);
+ });
+ } else {
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ });
+ }
+ });
+ })
+ });
+ } else { //涓嶆垚鍔�
+ $("#ImagesShow").html('');
+ res.msg, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }
+ }
+ })
+ }
// 鍙栨牱鏄庣粏鍗曟満浜嬩欢
table.on('tool(SamplingDetails)', function (obj) {
diff --git a/HTML/views/QualityControl/QualityInformationFrom.html b/HTML/views/QualityControl/QualityInformationFrom.html
index b16fd47..06e8017 100644
--- a/HTML/views/QualityControl/QualityInformationFrom.html
+++ b/HTML/views/QualityControl/QualityInformationFrom.html
@@ -30,8 +30,7 @@
<div class="layui-form-item">
<label class="layui-form-label">鎵规鍙�</label>
<div class="layui-input-block" style="width: 70%;">
- <input type="text" name="LotNo" placeholder="璇疯緭鍏ユ壒娆″彿" lay-verify="required" autocomplete="off"
- class="layui-input">
+ <input type="text" name="LotNo" placeholder="璇疯緭鍏ユ壒娆″彿" autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-form-item">
diff --git a/HTML/views/StatisticalReport/BoxInfor.html b/HTML/views/StatisticalReport/BoxInfor.html
index dcefb00..4eb09eb 100644
--- a/HTML/views/StatisticalReport/BoxInfor.html
+++ b/HTML/views/StatisticalReport/BoxInfor.html
@@ -205,7 +205,14 @@
<!-- #region 鑷畾涔夎〃澶� -->
<script type="text/html" id="templetProductionTime">
{{# function GetBtn(d){
- return formatDate(d.ProductionTime);
+ return formatDate2(d.ProductionTime);
+ }
+ }}
+ {{ GetBtn(d) }}
+ </script>
+ <script type="text/html" id="templetExpirationTime">
+ {{# function GetBtn(d){
+ return formatDate2(d.ExpirationTime);
}
}}
{{ GetBtn(d) }}
@@ -482,6 +489,7 @@
{ field: 'Qty', title: '鏁伴噺', width: 90, align: 'center' },
{ field: 'FullQty', title: '鏁寸鏁伴噺', width: 100, align: 'center' },
{ field: 'ProductionTime', title: '鐢熶骇鏃ユ湡', align: 'center', templet: '#templetProductionTime' },
+ { field: 'ExpirationTime', title: '鏈夋晥鏈�', align: 'center', templet: '#templetExpirationTime' },
{ field: 'InspectMark', title: '鎶芥鏍囪', align: 'center', templet: '#InspectMarkStatus' },
{ field: 'BitBoxMark', templet: '#BitPalletMarkStatus1', title: '闆剁鏍囪', align: 'center' },
{ field: 'InspectStatus', templet: '#InspectStatus1', title: '璐ㄦ鐘舵��', align: 'center' },
diff --git a/HTML/views/WareHouseSetting/Pallets.html b/HTML/views/WareHouseSetting/Pallets.html
index a7a3e9b..bb86cbb 100644
--- a/HTML/views/WareHouseSetting/Pallets.html
+++ b/HTML/views/WareHouseSetting/Pallets.html
@@ -1,445 +1,452 @@
<!DOCTYPE html>
<html>
- <head>
- <meta charset="utf-8">
- <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">
- <link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
- <link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
- <style media="print">
- @page{
- size: auto;
- margin: 0 0 0 30px;
- }
- </style>
- <script>
- // 杩欓噷鏄渶瑕佸湪椤甸潰娓叉煋涔嬪墠鎵ц鐨勪唬鐮�
- document.addEventListener("DOMContentLoaded", function() {
-
- //鑾峰彇table榛樿鏄剧ず鏁�
- pageCntFirst();
- });
- </script>
- </head>
- <body id="body">
- <div class="layui-fluid" style="padding-bottom: 0;">
- <div class="layui-card">
- <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: 70px;">鎵樼洏鏉＄爜锛�</label>
- <div class="layui-input-inline">
- <input type="text" id="PalletNo" name="PalletNo" placeholder="鎵樼洏鏉＄爜" autocomplete="off" class="layui-input">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">鏉＄爜鐘舵��</label>
- <div class="layui-input-inline">
- <select name="Status" id="Status" lay-verify="" lay-search>
- <option value=""></option>
- <option value="0">鏈娇鐢�</option>
- <option value="1">浣跨敤涓�</option>
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <button class="layui-btn layui-btn-sm layuiadmin-btn-list" lay-submit lay-filter="LAY-app-contlist-search">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>鎼滅储
- </button>
- </div>
- <div class="layui-inline">
- <button class="layui-btn layui-btn-sm layuiadmin-btn-list add" data-type="add">
- <i class="layui-icon layuiadmin-button-btn"></i>娣诲姞
- </button>
+
+<head>
+ <meta charset="utf-8">
+ <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">
+ <link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
+ <style media="print">
+ @page {
+ size: auto;
+ margin: 0 0 0 30px;
+ }
+ </style>
+ <script>
+ // 杩欓噷鏄渶瑕佸湪椤甸潰娓叉煋涔嬪墠鎵ц鐨勪唬鐮�
+ document.addEventListener("DOMContentLoaded", function () {
+
+ //鑾峰彇table榛樿鏄剧ず鏁�
+ pageCntFirst();
+ });
+ </script>
+</head>
+
+<body id="body">
+ <div class="layui-fluid" style="padding-bottom: 0;">
+ <div class="layui-card">
+ <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: 70px;">鎵樼洏鏉＄爜锛�</label>
+ <div class="layui-input-inline">
+ <input type="text" id="PalletNo" name="PalletNo" placeholder="鎵樼洏鏉＄爜" autocomplete="off"
+ class="layui-input">
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鏉＄爜鐘舵��</label>
+ <div class="layui-input-inline">
+ <select name="Status" id="Status" lay-verify="" lay-search>
+ <option value=""></option>
+ <option value="0">鏈娇鐢�</option>
+ <option value="1">浣跨敤涓�</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <button class="layui-btn layui-btn-sm layuiadmin-btn-list" lay-submit
+ lay-filter="LAY-app-contlist-search">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>鎼滅储
+ </button>
+ </div>
+ <div class="layui-inline">
+ <button class="layui-btn layui-btn-sm layuiadmin-btn-list add" data-type="add">
+ <i class="layui-icon layuiadmin-button-btn"></i>娣诲姞
+ </button>
+ </div>
</div>
- <div id="center"></div>
- <div class="layui-card-body">
- <table id="LAY-app-content-list" lay-filter="LAY-app-content-list"></table>
-
- <script type="text/html" id="table-content-list">
+ </div>
+ <div id="center"></div>
+ <div class="layui-card-body">
+ <table id="LAY-app-content-list" lay-filter="LAY-app-content-list"></table>
+
+ <script type="text/html" id="table-content-list">
<a class="approvalBtndel layui-btn layui-btn-normal layui-btn-xs queryClass" lay-event="edit"><i class="layui-icon layui-icon-search"></i>鏌ョ湅</a>
<a class="approvalBtn layui-btn layui-btn-normal layui-btn-xs buDaClass" lay-event="print"><i class="layui-icon layui-icon-print"></i>琛ユ墦</a>
</script>
- </div>
- <div id="print"></div>
</div>
+ <div id="print"></div>
</div>
-
- <script src="../../layuiadmin/layui/layui.js"></script>
- <script src="../../js/public.js"></script>
- <script src="../../js/jquery-3.5.1.min.js"></script>
- <script src="../../js/jquery.cookie.js"></script>
- <script src="../../js/jquery.print.js"></script>
- <script>
- layui.config({
- base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
- }).extend({
- index: 'lib/index' //涓诲叆鍙ｆā鍧�
- }).use(['index', 'table', 'laypage', 'layer'], function() {
- var table = layui.table,
- form = layui.form,
- laypage = layui.laypage,
- layer = layui.layer;
- var h1 = GetTableHeight();
- var isTrue= true;
-
- var where = {
- PalletNo:$("#PalletNo").val(),
- Status:$("#Status").val(),
- }
- var tableIns = table.render({
- elem: '#LAY-app-content-list',
- height: h1,
- id: 'LAY-app-content-list',
- url: IP + "/Sys/GetPalletsList",
- method: 'post',
- where: where,
- contentType: 'application/json',
- headers:{ToKen:$.cookie('token')},
- page: true,
- limit: pageCnt,
- limits: pageLimits,
- cellMinWidth: 80, //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
- done:function(){
- $(function() {
- $(".queryClass").hide();
- $(".buDaClass").hide();
- $(".add").hide();
- });
- sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function(res) {
- if (res.code == 0) { //鎴愬姛
- for (var k = 0; k < res.data.length; k++) {
- if (res.data[k].MenuName == "娣诲姞鏉＄爜") {
- $(function() {
- $(".add").show();
- });
- }
- if (res.data[k].MenuName == "鏌ョ湅鏉＄爜") {
- $(function() {
- $(".queryClass").show();
- });
- }
- if (res.data[k].MenuName == "琛ユ墦鏉＄爜") {
- $(function() {
- $(".buDaClass").show();
- });
- }
+ </div>
+
+ <script src="../../layuiadmin/layui/layui.js"></script>
+ <script src="../../js/public.js"></script>
+ <script src="../../js/jquery-3.5.1.min.js"></script>
+ <script src="../../js/jquery.cookie.js"></script>
+ <script src="../../js/jquery.print.js"></script>
+ <script>
+ layui.config({
+ base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'table', 'laypage', 'layer'], function () {
+ var table = layui.table,
+ form = layui.form,
+ laypage = layui.laypage,
+ layer = layui.layer;
+ var h1 = GetTableHeight();
+ var isTrue = true;
+
+ var where = {
+ PalletNo: $("#PalletNo").val(),
+ Status: $("#Status").val(),
+ }
+ var tableIns = table.render({
+ elem: '#LAY-app-content-list',
+ height: h1,
+ id: 'LAY-app-content-list',
+ url: IP + "/Sys/GetPalletsList",
+ method: 'post',
+ where: where,
+ contentType: 'application/json',
+ headers: { ToKen: $.cookie('token') },
+ page: true,
+ limit: pageCnt,
+ limits: pageLimits,
+ cellMinWidth: 80, //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
+ done: function () {
+ $(function () {
+ $(".queryClass").hide();
+ $(".buDaClass").hide();
+ $(".add").hide();
+ });
+ sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function (res) {
+ if (res.code == 0) { //鎴愬姛
+ for (var k = 0; k < res.data.length; k++) {
+ if (res.data[k].MenuName == "娣诲姞鏉＄爜") {
+ $(function () {
+ $(".add").show();
+ });
}
- } else { //涓嶆垚鍔�
- layer.msg('鑾峰彇鏉冮檺淇℃伅澶辫触', {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function() {});
+ if (res.data[k].MenuName == "鏌ョ湅鏉＄爜") {
+ $(function () {
+ $(".queryClass").show();
+ });
+ }
+ if (res.data[k].MenuName == "琛ユ墦鏉＄爜") {
+ $(function () {
+ $(".buDaClass").show();
+ });
+ }
}
- });
+ } else { //涓嶆垚鍔�
+ layer.msg('鑾峰彇鏉冮檺淇℃伅澶辫触', {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () { });
+ }
+ });
+ },
+ cols: [
+ [{
+ title: '搴忓彿',
+ type: 'numbers',
+ width: 65,
+ fixed: 'left'
+ }, {
+ field: 'PalletNo',
+ title: '鎵樼洏鏉＄爜',
+ align: 'center',
+ }, {
+ field: 'Status',
+ title: '鏉＄爜鐘舵��',
+ align: 'center',
+ templet: function (d) {
+ switch (d.Status) {
+ case "0":
+ return `<button class="layui-btn layui-btn-radius layui-btn-xs">鏈娇鐢�</button>`;
+ case "1":
+ return `<button class="layui-btn layui-btn-radius layui-btn-warm layui-btn-xs">浣跨敤涓�</button>`;
+ default:
+ return "";
+ }
+ }
+ }, {
+ field: 'CreateUserName',
+ title: '鍒涘缓浜�',
+ align: 'center',
+ }, {
+ field: 'CreateTime',
+ title: '鍒涘缓鏃堕棿',
+ align: 'center',
+ templet: function (d) {
+ return formatDate(d.CreateTime);
+ }
+ }, {
+ field: 'LastUse',
+ title: '涓婃浣跨敤鏃堕棿',
+ align: 'center',
+ templet: function (d) {
+ return formatDate(d.LastUse);
+ }
+ }, {
+ title: '鎿嶄綔',
+ fixed: 'right',
+ width: 220,
+ align: 'center',
+ toolbar: '#table-content-list'
+ }]
+ ],
+ });
+ //鐩戝惉鎼滅储
+ form.on('submit(LAY-app-contlist-search)', function (data) {
+ tableIns.reload({
+ where: {
+ PalletNo: $("#PalletNo").val(),
+ Status: $("#Status").val(),
},
- cols: [
- [{
- title: '搴忓彿',
- type: 'numbers',
- width: 65,
- fixed: 'left'
- }, {
- field: 'PalletNo',
- title: '鎵樼洏鏉＄爜',
- align: 'center',
- }, {
- field: 'Status',
- title: '鏉＄爜鐘舵��',
- align: 'center',
- templet:function(d){
- switch (d.Status) {
- case "0":
- return `<button class="layui-btn layui-btn-radius layui-btn-xs">鏈娇鐢�</button>`;
- case "1":
- return `<button class="layui-btn layui-btn-radius layui-btn-warm layui-btn-xs">浣跨敤涓�</button>`;
- default:
- return "";
- }
- }
- }, {
- field: 'CreateUserName',
- title: '鍒涘缓浜�',
- align: 'center',
- } ,{
- field: 'CreateTime',
- title: '鍒涘缓鏃堕棿',
- align: 'center',
- templet:function(d){
- return formatDate(d.CreateTime);
- }
- }, {
- field: 'LastUse',
- title: '涓婃浣跨敤鏃堕棿',
- align: 'center',
- templet:function(d){
- return formatDate(d.LastUse);
- }
- }, {
- title: '鎿嶄綔',
- fixed: 'right',
- width: 220,
- align: 'center',
- toolbar: '#table-content-list'
- }]
- ],
- });
- //鐩戝惉鎼滅储
- form.on('submit(LAY-app-contlist-search)', function(data) {
- tableIns.reload({
- where:{
- PalletNo:$("#PalletNo").val(),
- Status:$("#Status").val(),
- },
- page: {
- curr: 1
- }
- });
- });
-
- $(function() {
- $(".addClass").hide();
- });
- sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function(res) {
- if (res.code == 0) { //鎴愬姛
- for (var k = 0; k < res.data.length; k++) {
- if (res.data[k].MenuName == "娣诲姞鏉＄爜") {
- $(function() {
- $(".addClass").show();
- });
- }
- }
- } else { //涓嶆垚鍔�
- layer.msg('鑾峰彇鏉冮檺淇℃伅澶辫触', {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function() {});
+ page: {
+ curr: 1
}
});
+ });
+
+ $(function () {
+ $(".addClass").hide();
+ });
+ sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function (res) {
+ if (res.code == 0) { //鎴愬姛
+ for (var k = 0; k < res.data.length; k++) {
+ if (res.data[k].MenuName == "娣诲姞鏉＄爜") {
+ $(function () {
+ $(".addClass").show();
+ });
+ }
+ }
+ } else { //涓嶆垚鍔�
+ layer.msg('鑾峰彇鏉冮檺淇℃伅澶辫触', {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () { });
+ }
+ });
-
-
- var active = {
- add: function() {
- layer.open({
- type: 2,
- title: '鎵撳嵃鎵樼洏鏉＄爜',
- content: 'PalletsPrintFrom.html',
- maxmin: true,
- area: ['600px', '300px'],
- btn: ['纭畾', '鍙栨秷'],
- yes: function(index, layero){
- var iframeWindow = window['layui-layer-iframe'+ index]
- ,submitID = 'layuiadmin-app-form-submit'
- ,submit = layero.find('iframe').contents().find('#'+ submitID);
- //鐩戝惉鎻愪氦
- iframeWindow.layui.form.on('submit('+ submitID +')', function(data){
- var field = data.field; //鑾峰彇鎻愪氦鐨勫瓧娈�
- console.log(field);
- if (isTrue = true) {
- isTrue = false;
-
- var html = "";
- var xun = 0;
- document.getElementById('print').innerHTML="";
- for(var i=0;i<field.GroupCount;i++){
-
- for(var j=0;j<field.SameCount;j++){
- html ="<div class=\"layui-form\" lay-filter=\"layuiadmin-app-form-list\" id=\"print\" style=\"width: 50%; text-align: center;padding-top: 10%;margin-left: 0%;\">\n"+
- "<div class=\"layui-form-item\">\n"+
- "<div class=\"layui-inline\">\n"+
- "<div class=\"\">\n"+
- "<img id=\"imgBar\" width=\"245px\" height=\"120px\"/></div>\n"+
- "</div>\n"+
- "</div>\n"+
- "</div>\n"+
- "<div style=\"page-break-after: always;\"></div>\n"+
- "</div>" ;
- document.getElementById('print').innerHTML+=html;
- document.getElementById('imgBar').id="imgBar"+xun;
- xun+=1
- }
- }
- GetimgBar(field.StockCode,field.GroupCount,field.SameCount);
- layer.close(index);
- }
- });
- submit.trigger('click');
- },
- end:function(){
- location.reload();
- return false;
- }
- });
- }
- };
- $('.layui-btn.layuiadmin-btn-list').on('click', function() {
- var type = $(this).data('type');
- active[type] ? active[type].call(this) : '';
- });
- //鑾峰彇娣诲姞鏉″舰鐮�
- function GetimgBar(StockCode,GroupCount,SameCount){
- var param = {
- PalletNo:StockCode,
- GroupCount: parseInt(GroupCount),
- SameCount:parseInt(SameCount),
- };
- console.log(param);
- synData(IP + "/Sys/GetImgBar", param, 'post', function(res) {
- console.log(res);
- if (res.code == 0) { //鎴愬姛
- for(var i=0;i<res.data.length;i++){
- $("#"+"imgBar"+i).attr("src", res.data[i]);
- }
-
- AddPallets(StockCode,GroupCount);
- } else { //涓嶆垚鍔�
- layer.msg(res.msg, {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function() {});
- }
- });
-
- };
- //娣诲姞鏉″舰鐮�
- function AddPallets(StockCode,GroupCount){
- //鎻愪氦 Ajax 鎴愬姛鍚庯紝闈欐�佹洿鏂拌〃鏍间腑鐨勬暟鎹�
- var param = {
- GroupCount:parseInt(GroupCount),
- };
- synData(IP + "/Sys/AddPallets", param, 'post', function(res) {
- console.log(res);
- if (res.code == 0) { //鎴愬姛
- $("#print").print();
-
- } else if(res.code == 1){
- layer.msg(res.msg, {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function() {});
- } else { //涓嶆垚鍔�
- layer.msg(res.statusText, {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function() {});
- }
- });
- };
- //鑾峰彇琛ユ墦鏉″舰鐮�
- function GetimgBar1(StockCode,GroupCount,SameCount){
-
- var param = {
- PalletNo:StockCode,
- GroupCount:parseInt(GroupCount),
- SameCount:parseInt(SameCount),
- };
- synData(IP + "/Sys/GetImgBarReprint", param, 'post', function(res) {
- console.log(res);
-
- if (res.code == 0) { //鎴愬姛
- var ok=false;
- for(var i=0;i<res.data.length;i++){
- $("#"+"imgBar"+i).attr("src", res.data[i]);
- if(i==(res.data.length-1)){
- ok=true;
- }
- }
- if(ok){
- $("#print").print();
- }
- } else { //涓嶆垚鍔�
- layer.msg(res.msg, {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function() {});
- }
- })
- };
-
- table.on('tool(LAY-app-content-list)', function(obj) {
- var data = obj.data;
- if (obj.event === 'edit') {
- layer.open({
- type: 2,
- title: '鎵樼洏鏃堕棿绾�',
- content: 'PalletsTimeLine.html?PalletNo=' + data.PalletNo,
- maxmin: true,
- area: ['700px', '650px'],
- btn: ['纭畾', '鍙栨秷'],
- yes: function(index, layero){
- layer.close(index); //鍏抽棴寮瑰眰
- }
- });
- }
- if (obj.event === 'print') {
- PalletNo = data.PalletNo;
-
- layer.open({
- type: 2,
- title: '鎵撳嵃鎵樼洏鏉＄爜',
- content: 'PalletsPrintFrom.html?PalletNo='+PalletNo,
- maxmin: true,
- area: ['600px', '300px'],
- btn: ['纭畾', '鍙栨秷'],
- yes: function(index, layero){
- var iframeWindow = window['layui-layer-iframe'+ index]
- ,submitID = 'layuiadmin-app-form-submit'
- ,submit = layero.find('iframe').contents().find('#'+ submitID);
- //鐩戝惉鎻愪氦
- iframeWindow.layui.form.on('submit('+ submitID +')', function(data){
- var field = data.field; //鑾峰彇鎻愪氦鐨勫瓧娈�
- console.log(field);
+
+
+ var active = {
+ add: function () {
+ layer.open({
+ type: 2,
+ title: '鎵撳嵃鎵樼洏鏉＄爜',
+ content: 'PalletsPrintFrom.html',
+ maxmin: true,
+ area: ['600px', '300px'],
+ btn: ['纭畾', '鍙栨秷'],
+ yes: function (index, layero) {
+ var iframeWindow = window['layui-layer-iframe' + index]
+ , submitID = 'layuiadmin-app-form-submit'
+ , submit = layero.find('iframe').contents().find('#' + submitID);
+ //鐩戝惉鎻愪氦
+ iframeWindow.layui.form.on('submit(' + submitID + ')', function (data) {
+ var field = data.field; //鑾峰彇鎻愪氦鐨勫瓧娈�
+ console.log(field);
+ if (isTrue = true) {
+ isTrue = false;
+
var html = "";
var xun = 0;
- var isOk = false;
- document.getElementById('print').innerHTML="";
-
- for(var i=0;i<parseInt(field.GroupCount);i++){
-
- for(var j=0;j<parseInt(field.SameCount);j++){
- html ="<div class=\"layui-form\" lay-filter=\"layuiadmin-app-form-list\" id=\"print\" style=\"width: 50%; text-align: center;padding-top: 10%;margin-left: 0%;\">\n"+
- "<div class=\"layui-form-item\">\n"+
- "<div class=\"layui-inline\">\n"+
- "<div class=\"\">\n"+
- "<img id=\"imgBar\" width=\"245px\" height=\"120px\" /></div>\n"+
- "</div>\n"+
- "</div>\n"+
- "</div>\n"+
- "<div style=\"page-break-after: always;\"></div>\n"+
- "</div>" ;
- document.getElementById('print').innerHTML+=html;
- document.getElementById('imgBar').id="imgBar"+xun;
- xun+=1
-
- }
-
- if(i==(parseInt(field.GroupCount)-1)){
- isOk= true;
+ document.getElementById('print').innerHTML = "";
+ for (var i = 0; i < field.GroupCount; i++) {
+
+ for (var j = 0; j < field.SameCount; j++) {
+ html = "<div class=\"layui-form\" lay-filter=\"layuiadmin-app-form-list\" id=\"print\" style=\"width: 50%; text-align: center;padding-top: 20%;margin-left: 19%;\">\n" +
+ "<div class=\"layui-form-item\">\n" +
+ "<div class=\"layui-inline\">\n" +
+ "<div class=\"\">\n" +
+ "<img id=\"imgBar\" width=\"245px\" height=\"120px\"/></div>\n" +
+ "</div>\n" +
+ "</div>\n" +
+ "</div>\n" +
+ "<div style=\"page-break-after: always;\"></div>\n" +
+ "</div>";
+ document.getElementById('print').innerHTML += html;
+ document.getElementById('imgBar').id = "imgBar" + xun;
+ xun += 1
}
}
- if(isOk){
- GetimgBar1(field.StockCode,field.GroupCount,field.SameCount);
- }
- });
- submit.trigger('click');
- },
- end:function(){
- location.reload();
- return false;
- }
-
- });
+ GetimgBar(field.StockCode, field.GroupCount, field.SameCount);
+ layer.close(index);
+ }
+ });
+ submit.trigger('click');
+ },
+ end: function () {
+ location.reload();
+ return false;
+ }
+ });
+ }
+ };
+ $('.layui-btn.layuiadmin-btn-list').on('click', function () {
+ var type = $(this).data('type');
+ active[type] ? active[type].call(this) : '';
+ });
+ //鑾峰彇娣诲姞鏉″舰鐮�
+ function GetimgBar(StockCode, GroupCount, SameCount) {
+ var param = {
+ PalletNo: StockCode,
+ GroupCount: parseInt(GroupCount),
+ SameCount: parseInt(SameCount),
+ };
+ console.log(param);
+ synData(IP + "/Sys/GetImgBar", param, 'post', function (res) {
+ console.log(res);
+ if (res.code == 0) { //鎴愬姛
+ for (var i = 0; i < res.data.length; i++) {
+ $("#" + "imgBar" + i).attr("src", res.data[i]);
+ }
+
+ AddPallets(StockCode, GroupCount);
+ } else { //涓嶆垚鍔�
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () { });
}
});
-
-
+
+ };
+ //娣诲姞鏉″舰鐮�
+ function AddPallets(StockCode, GroupCount) {
+ //鎻愪氦 Ajax 鎴愬姛鍚庯紝闈欐�佹洿鏂拌〃鏍间腑鐨勬暟鎹�
+ var param = {
+ GroupCount: parseInt(GroupCount),
+ };
+ synData(IP + "/Sys/AddPallets", param, 'post', function (res) {
+ console.log(res);
+ if (res.code == 0) { //鎴愬姛
+ $("#print").print();
+
+ } else if (res.code == 1) {
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () { });
+ } else { //涓嶆垚鍔�
+ layer.msg(res.statusText, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () { });
+ }
+ });
+ };
+ //鑾峰彇琛ユ墦鏉″舰鐮�
+ function GetimgBar1(StockCode, GroupCount, SameCount) {
+
+ var param = {
+ PalletNo: StockCode,
+ GroupCount: parseInt(GroupCount),
+ SameCount: parseInt(SameCount),
+ };
+ synData(IP + "/Sys/GetImgBarReprint", param, 'post', function (res) {
+ console.log(res);
+
+ if (res.code == 0) { //鎴愬姛
+ var ok = false;
+ for (var i = 0; i < res.data.length; i++) {
+ $("#" + "imgBar" + i).attr("src", res.data[i]);
+ if (i == (res.data.length - 1)) {
+ ok = true;
+ }
+ }
+ if (ok) {
+ $("#print").print();
+ }
+ } else { //涓嶆垚鍔�
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () { });
+ }
+ })
+ };
+
+ table.on('tool(LAY-app-content-list)', function (obj) {
+ var data = obj.data;
+ if (obj.event === 'edit') {
+ layer.open({
+ type: 2,
+ title: '鎵樼洏鏃堕棿绾�',
+ content: 'PalletsTimeLine.html?PalletNo=' + data.PalletNo,
+ maxmin: true,
+ area: ['700px', '650px'],
+ btn: ['纭畾', '鍙栨秷'],
+ yes: function (index, layero) {
+ layer.close(index); //鍏抽棴寮瑰眰
+ }
+ });
+ }
+ if (obj.event === 'print') {
+ PalletNo = data.PalletNo;
+
+ layer.open({
+ type: 2,
+ title: '鎵撳嵃鎵樼洏鏉＄爜',
+ content: 'PalletsPrintFrom.html?PalletNo=' + PalletNo,
+ maxmin: true,
+ area: ['600px', '300px'],
+ btn: ['纭畾', '鍙栨秷'],
+ yes: function (index, layero) {
+ var iframeWindow = window['layui-layer-iframe' + index]
+ , submitID = 'layuiadmin-app-form-submit'
+ , submit = layero.find('iframe').contents().find('#' + submitID);
+ //鐩戝惉鎻愪氦
+ iframeWindow.layui.form.on('submit(' + submitID + ')', function (data) {
+ var field = data.field; //鑾峰彇鎻愪氦鐨勫瓧娈�
+ console.log(field);
+ var html = "";
+ var xun = 0;
+ var isOk = false;
+ document.getElementById('print').innerHTML = "";
+
+ for (var i = 0; i < parseInt(field.GroupCount); i++) {
+
+ for (var j = 0; j < parseInt(field.SameCount); j++) {
+ html = "<div class=\"layui-form\" lay-filter=\"layuiadmin-app-form-list\" id=\"print\" style=\"width: 50%; text-align: center;padding-top: 20%;margin-left: 19%;\">\n" +
+ "<div class=\"layui-form-item\">\n" +
+ "<div class=\"layui-inline\">\n" +
+ "<div class=\"\">\n" +
+ "<img id=\"imgBar\" width=\"245px\" height=\"120px\" /></div>\n" +
+ "</div>\n" +
+ "</div>\n" +
+ "</div>\n" +
+ "<div style=\"page-break-after: always;\"></div>\n" +
+ "</div>";
+ document.getElementById('print').innerHTML += html;
+ document.getElementById('imgBar').id = "imgBar" + xun;
+ xun += 1
+
+ }
+
+ if (i == (parseInt(field.GroupCount) - 1)) {
+ isOk = true;
+ }
+ }
+ if (isOk) {
+ GetimgBar1(field.StockCode, field.GroupCount, field.SameCount);
+ }
+ });
+ submit.trigger('click');
+ },
+ end: function () {
+ location.reload();
+ return false;
+ }
+
+ });
+ }
});
- </script>
- </body>
-</html>
+
+
+ });
+ </script>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/Pda/View/AsnSetting/productEnterQuantity.html b/Pda/View/AsnSetting/productEnterQuantity.html
index ed63d72..75e05b7 100644
--- a/Pda/View/AsnSetting/productEnterQuantity.html
+++ b/Pda/View/AsnSetting/productEnterQuantity.html
@@ -737,7 +737,7 @@
'</option>');
} else {
$("#goodSelect").append('<option value =' + res.data[i].Id + '-' + i + ' selected>' + res.data[i]
- .SkuName + "-" + res.data[i].LotNo +
+ .SkuName + "=>" + res.data[i].LotNo +
'</option>');
}
} else {
@@ -748,7 +748,7 @@
'</option>');
} else {
$("#goodSelect").append('<option value =' + res.data[i].Id + '-' + i + ' selected>' + res.data[i]
- .SkuName + "-" + res.data[i].LotNo +
+ .SkuName + "=>" + res.data[i].LotNo +
'</option>');
}
@@ -759,7 +759,7 @@
'</option>');
} else {
$("#goodSelect").append('<option value =' + res.data[i].Id + '-' + i + '>' + res.data[i]
- .SkuName + "-" + res.data[i].LotNo +
+ .SkuName + "=>" + res.data[i].LotNo +
'</option>');
}
}
@@ -811,7 +811,7 @@
.SkuName);
}
if (res.data[i].LotNo != null) {
- $("#goodSelect1").append("-" + res.data[i].LotNo +
+ $("#goodSelect1").append("=>" + res.data[i].LotNo +
'</option>');
}
} else {
@@ -821,7 +821,7 @@
'</option>');
} else {
$("#goodSelect1").append('<option value =' + res.data[i].Id + ' selected>' + res.data[i]
- .SkuName + "-" + res.data[i].LotNo +
+ .SkuName + "=>" + res.data[i].LotNo +
'</option>');
}
}
diff --git a/Wms/Model/ModelDto/BllAsnDto/LabelPrintInfoDto.cs b/Wms/Model/ModelDto/BllAsnDto/LabelPrintInfoDto.cs
new file mode 100644
index 0000000..202683c
--- /dev/null
+++ b/Wms/Model/ModelDto/BllAsnDto/LabelPrintInfoDto.cs
@@ -0,0 +1,31 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Model.ModelDto.BllAsnDto
+{
+ public class LabelPrintInfoDto
+ {
+ /// <summary>
+ /// 鍓╀綑鎵撳嵃鐨勬暟閲�
+ /// </summary>
+ public string Qty { get; set; }
+ /// <summary>
+ /// 鐢熶骇鏃ユ湡
+ /// </summary>
+ public string ProductionTime { get; set; }
+ /// <summary>
+ /// 鏈夋晥鏈�
+ /// </summary>
+ public string ExpirationTime { get; set; }
+ /// <summary>
+ /// 鍌ㄥ瓨鏈熻嚦
+ /// </summary>
+ public string StoreTime { get; set; }
+
+ /// <summary>
+ /// 渚涜揣鎵规
+ /// </summary>
+ public string SupplierLot { get; set; }
+ }
+}
diff --git a/Wms/Model/ModelVm/BllAsnVm/ArrivalNoticeDetailVm.cs b/Wms/Model/ModelVm/BllAsnVm/ArrivalNoticeDetailVm.cs
index 8993c90..af1262f 100644
--- a/Wms/Model/ModelVm/BllAsnVm/ArrivalNoticeDetailVm.cs
+++ b/Wms/Model/ModelVm/BllAsnVm/ArrivalNoticeDetailVm.cs
@@ -147,6 +147,11 @@
public string Lot6 { get; set; }
/// <summary>
+ /// 鏍囩甯稿��
+ /// </summary>
+ public string BoxCodeStr { get; set; }
+
+ /// <summary>
/// 鑷畾涔夊垪1
/// </summary>
public string UDF1 { get; set; }
diff --git a/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs b/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
index edf83da..e0381b5 100644
--- a/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
+++ b/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
@@ -1,5 +1,6 @@
锘縰sing Model.InterFaceModel;
using Model.ModelDto;
+using Model.ModelDto.BllAsnDto;
using Model.ModelDto.SysDto;
using Model.ModelVm;
using Model.ModelVm.SysVm;
@@ -138,7 +139,7 @@
}
//鑾峰彇鍏ュ簱鍗曟槑缁嗗墿浣欐墦鍗版暟閲�
- public string GetAsnDetailQtyList(int id)
+ public LabelPrintInfoDto GetAsnDetailQtyList(int id)
{
try
{
@@ -147,7 +148,11 @@
{
throw new Exception("鏈煡璇㈠埌鍏ュ簱鍗曟槑缁�");
}
+ var data = new LabelPrintInfoDto();
+ data.ProductionTime = string.IsNullOrEmpty(detail.Lot1) ? "" : Convert.ToDateTime(detail.Lot1).ToString("yyyy-MM-dd");
+ data.ExpirationTime = string.IsNullOrEmpty(detail.Lot2) ? "" : Convert.ToDateTime(detail.Lot2).ToString("yyyy-MM-dd");
+ data.SupplierLot = detail.SupplierLot;
var labelQty = Db.Queryable<BllBoxInfo>().Where(m => m.IsDel == "0" && m.ASNDetailNo == id).Sum(m => m.Qty + (m.SamplingQty == null? 0: m.SamplingQty));
if (labelQty == null)
{
@@ -158,7 +163,8 @@
{
qty = 0;
}
- return qty.ToString();
+ data.Qty = qty.ToString();
+ return data;
}
catch (Exception e)
{
@@ -353,12 +359,27 @@
detailModel.LotNo = maxLotNo;
}
}
- if (model.Type == "0" || model.Type == "1" || model.Type == "2" || model.Type == "3" || model.Type == "4" && model.Type == "8")
+ //if (model.Type == "0" || model.Type == "1" || model.Type == "2" || model.Type == "3" || model.Type == "4" && model.Type == "8")
+ //{
+ // if (string.IsNullOrWhiteSpace(detailModel.LotNo))
+ // {
+ // throw new Exception("褰撳墠鍗曟嵁绫诲瀷鎵规涓嶅彲涓虹┖!");
+ // }
+ //}
+ detailModel.BoxCodeStr = detailModel.LotNo;
+ if (string.IsNullOrWhiteSpace(detailModel.LotNo))
{
- if (string.IsNullOrWhiteSpace(detailModel.LotNo))
+ string toDayTime = DateTime.Now.ToString("yyyyMM");
+ var maxBoxCodeStr = Db.Queryable<BllArrivalNoticeDetail>().Where(m => m.IsDel == "0" && m.BoxCodeStr.Contains("BK") && m.CreateTime.ToString("yyyyMMdd") == DateTime.Now.ToString("yyyyMMdd")).Max(m => m.BoxCodeStr);
+ if(string.IsNullOrWhiteSpace(maxBoxCodeStr))
{
- throw new Exception("褰撳墠鍗曟嵁绫诲瀷鎵规涓嶅彲涓虹┖!");
+ maxBoxCodeStr = "BK" + toDayTime.Substring(2, 4) + "0001";
}
+ else
+ {
+ maxBoxCodeStr = "BK" + (int.Parse(maxBoxCodeStr.Replace("BK", "")) + 1).ToString();
+ }
+ detailModel.BoxCodeStr = maxBoxCodeStr;
}
// 鍒ゆ柇鏄惁宸插瓨鍦ㄥ綋鍓嶆槑缁�
@@ -384,18 +405,18 @@
}
string lot1 = detailModel.Lot1;
string lot2 = detailModel.Lot2;
- if (sku.IsPasteCode == "0")
+ if (sku.IsInspect == "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();
lot2 = lot22.ToString();
@@ -412,7 +433,7 @@
SkuNo = detailModel.SkuNo,
SkuName = detailModel.SkuName,
Standard = detailModel.Standard,
- LotNo = detailModel.LotNo.Trim(),
+ LotNo = detailModel.LotNo == null ? "" : detailModel.LotNo.Trim(),
LotText = detailModel.LotText,
Qty = (decimal)detailModel.Qty,
PackagNo = detailModel.PackagNo,
@@ -428,6 +449,7 @@
InspectStatus = "0",
Lot1 = lot1, //鐢熶骇鏃ユ湡
Lot2 = lot2, // 杩囨湡鏃ユ湡
+ BoxCodeStr = detailModel.BoxCodeStr,
UDF1 = detailModel.UDF1,
UDF2 = detailModel.UDF2,
UDF3 = detailModel.UDF3,
@@ -553,13 +575,13 @@
return strMessage;
}
- if (model.Type == "0" || model.Type == "2" || model.Type == "3" || model.Type == "4")
- {
- if (string.IsNullOrWhiteSpace(detailModel.LotNo))
- {
- throw new Exception("褰撳墠鍗曟嵁绫诲瀷鎵规涓嶅彲涓虹┖!");
- }
- }
+ //if (model.Type == "0" || model.Type == "2" || model.Type == "3" || model.Type == "4")
+ //{
+ // if (string.IsNullOrWhiteSpace(detailModel.LotNo))
+ // {
+ // throw new Exception("褰撳墠鍗曟嵁绫诲瀷鎵规涓嶅彲涓虹┖!");
+ // }
+ //}
if (TypeLot.Contains(model.Type))
{
@@ -589,29 +611,39 @@
//鐢熸垚鑷湁鎵规
if (detailModel.Id == 0 || detailModel.Id == null || string.IsNullOrWhiteSpace(detailModel.LotNo))
{
- var notice = Db.Queryable<BllArrivalNotice>().Where(m => m.IsDel == "0" && TypeLot.Contains(m.Type)).Select(m => m.ASNNo).ToList();
- if (string.IsNullOrWhiteSpace(maxLotNo))
+ //var notice = Db.Queryable<BllArrivalNotice>().Where(m => m.IsDel == "0" && TypeLot.Contains(m.Type)).Select(m => m.ASNNo).ToList();
+ //if (string.IsNullOrWhiteSpace(maxLotNo))
+ //{
+ // maxLotNo = Db.Queryable<BllArrivalNoticeDetail>().Where(m => m.IsDel == "0" && !string.IsNullOrWhiteSpace(m.LotNo) && notice.Contains(m.ASNNo)).Max(m => m.LotNo);
+ //}
+ //if (string.IsNullOrWhiteSpace(maxLotNo))
+ //{
+ // maxLotNo = toDayTime.Substring(2, 6) + "0001";
+ //}
+ //else
+ //{
+ // var lotStr = maxLotNo.Substring(0, 6);
+ // var timeStr = toDayTime.Substring(2, 6);
+ // if (lotStr == timeStr)
+ // {
+ // maxLotNo = toDayTime.Substring(2, 6) + (int.Parse(maxLotNo.Substring(6, 4)) + 1).ToString().PadLeft(4, '0');
+ // }
+ // else
+ // {
+ // maxLotNo = timeStr + "0001";
+ // }
+ //}
+ //detailModel.LotNo = maxLotNo;
+ var maxBoxCodeStr = Db.Queryable<BllArrivalNoticeDetail>().Where(m => m.IsDel == "0" && m.BoxCodeStr.Contains("BK") && m.CreateTime.ToString("yyyyMMdd") == DateTime.Now.ToString("yyyyMMdd")).Max(m => m.BoxCodeStr);
+ if (string.IsNullOrWhiteSpace(maxBoxCodeStr))
{
- maxLotNo = Db.Queryable<BllArrivalNoticeDetail>().Where(m => m.IsDel == "0" && !string.IsNullOrWhiteSpace(m.LotNo) && notice.Contains(m.ASNNo)).Max(m => m.LotNo);
- }
- if (string.IsNullOrWhiteSpace(maxLotNo))
- {
- maxLotNo = toDayTime.Substring(2, 6) + "0001";
+ maxBoxCodeStr = "BK" + toDayTime.Substring(2, 4) + "0001";
}
else
{
- var lotStr = maxLotNo.Substring(0, 6);
- var timeStr = toDayTime.Substring(2, 6);
- if (lotStr == timeStr)
- {
- maxLotNo = toDayTime.Substring(2, 6) + (int.Parse(maxLotNo.Substring(6, 4)) + 1).ToString().PadLeft(4, '0');
- }
- else
- {
- maxLotNo = timeStr + "0001";
- }
+ maxBoxCodeStr = "BK" + (int.Parse(maxBoxCodeStr.Replace("BK", "")) + 1).ToString();
}
- detailModel.LotNo = maxLotNo;
+ detailModel.BoxCodeStr = maxBoxCodeStr;
}
if (detailModel.Id == 0 || detailModel.Id == null)
@@ -630,7 +662,7 @@
SkuNo = detailModel.SkuNo,
SkuName = detailModel.SkuName,
Standard = detailModel.Standard,
- LotNo = detailModel.LotNo.Trim(),
+ LotNo = detailModel.LotNo == null ? "" : detailModel.LotNo.Trim(),
LotText = detailModel.LotText,
Qty = (decimal)detailModel.Qty,
PackagNo = detailModel.PackagNo,
@@ -646,6 +678,7 @@
InspectStatus = "0",
Lot1 = detailModel.Lot1,
Lot2 = detailModel.Lot2,
+ BoxCodeStr = detailModel.BoxCodeStr,
UDF1 = detailModel.UDF1,
UDF2 = detailModel.UDF2,
UDF3 = detailModel.UDF3,
@@ -668,6 +701,7 @@
&& it.IsBelt == detailModel.IsBelt
&& it.Lot1 == detailModel.Lot1 // 鐢熶骇鏃ユ湡
&& it.Lot2 == detailModel.Lot2 // 杩囨湡鏃ユ湡
+ && it.BoxCodeStr == detailModel.BoxCodeStr
&& it.UDF1 == detailModel.UDF1
&& it.UDF2 == detailModel.UDF2
&& it.UDF3 == detailModel.UDF3
@@ -695,13 +729,14 @@
detailModel.Money = detailModel.Price * detailModel.Qty;
dbDetail.Qty = (decimal)detailModel.Qty;
- dbDetail.LotNo = detailModel.LotNo;
+ dbDetail.LotNo = detailModel.LotNo == null ? "" : detailModel.LotNo.Trim();
dbDetail.Money = detailModel.Money;
dbDetail.LotText = detailModel.LotText;
dbDetail.SupplierLot = detailModel.SupplierLot;
dbDetail.IsBale = detailModel.IsBale;
dbDetail.Lot1 = detailModel.Lot1;
dbDetail.Lot2 = detailModel.Lot2;
+ dbDetail.BoxCodeStr = detailModel.BoxCodeStr;
dbDetail.UDF1 = detailModel.UDF1;
dbDetail.UDF2 = detailModel.UDF2;
dbDetail.UDF3 = detailModel.UDF3;
diff --git a/Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs b/Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs
index ace488b..e57b70b 100644
--- a/Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs
+++ b/Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs
@@ -514,7 +514,7 @@
CreateTime = a.CreateTime,
UpdateTime = a.UpdateTime
- }).OrderByDescending(a => a.CreateTime).OrderBy(a => a.BoxNo).ToOffsetPage(model.Page, model.Limit, ref total);
+ }).OrderByDescending(a => a.ASNNo).OrderBy(a => a.BoxNo).ToOffsetPage(model.Page, model.Limit, ref total);
count = total;
return data;
}
@@ -597,9 +597,13 @@
{
throw new Exception("鍗曟嵁鏁伴噺涓嶈兘灏忎簬绛変簬0");
}
- if (string.IsNullOrWhiteSpace(asnList.LotNo))
+ //if (string.IsNullOrWhiteSpace(asnList.LotNo))
+ //{
+ // throw new Exception("鍗曟嵁鎵规鍙蜂笉鑳戒负绌�");
+ //}
+ if (string.IsNullOrWhiteSpace(asnList.BoxCodeStr))
{
- throw new Exception("鍗曟嵁鎵规鍙蜂笉鑳戒负绌�");
+ throw new Exception("鍗曟嵁绠辩爜甯稿�间笉鑳戒负绌�");
}
var asn = Db.Queryable<BllArrivalNotice>().First(m => m.ASNNo == asnList.ASNNo && m.IsDel == "0");
if (asn == null)
@@ -723,9 +727,16 @@
string maxLotNoStr = ""; //鎵规鍙�
string maxBoxCode = ""; //绠辩爜鍙�
-
- maxLotNoStr = asnList.LotNo;
- maxBoxCode = label.Where(m => m.LotNo == maxLotNoStr).Max(a => a.BoxNo);
+
+ maxLotNoStr = asnList.BoxCodeStr;//asnList.LotNo;
+ if (string.IsNullOrEmpty(asnList.LotNo))
+ {
+ maxBoxCode = label.Where(m => m.ASNDetailNo == asnList.Id).Max(a => a.BoxNo);
+ }
+ else
+ {
+ maxBoxCode = label.Where(m => m.LotNo == maxLotNoStr).Max(a => a.BoxNo);
+ }
#endregion
for (int i = 1; i <= labelNum; i++)
@@ -772,7 +783,7 @@
Status = "0",
SkuNo = asnList.SkuNo,
SkuName = asnList.SkuName,
- LotNo = maxLotNoStr,
+ LotNo = asnList.LotNo,//maxLotNoStr,
Standard = asnList.Standard,
PackageStandard = packStr,
SupplierLot = supplierLot,
@@ -1027,6 +1038,7 @@
model.ExpirationTime = data.ExpirationTime; // 鏈夋晥鏈熻嚦
model.StoreTime = data.StoreTime; // 鍌ㄥ瓨鏈熻嚦
+ model.ProductionTime = data.ProductionTime;//鐢熶骇鏃ユ湡
model.Qty = dataList.Sum(m => m.Qty);// 鏁伴噺
@@ -1082,6 +1094,7 @@
model.ExpirationTime = data.ExpirationTime; // 鏈夋晥鏈熻嚦
model.StoreTime = data.StoreTime; // 鍌ㄥ瓨鏈熻嚦
+ model.ProductionTime = data.ProductionTime;//鐢熶骇鏃ユ湡
model.Qty = data1.Sum(m => m.Qty);// 鏁伴噺
@@ -1134,6 +1147,7 @@
model.ExpirationTime = data.ExpirationTime; // 鏈夋晥鏈熻嚦
model.StoreTime = data.StoreTime; // 鍌ㄥ瓨鏈熻嚦
+ model.ProductionTime = data.ProductionTime;//鐢熶骇鏃ユ湡
model.Qty = data.Qty;// 鏁伴噺
@@ -1186,6 +1200,7 @@
model.ExpirationTime = data.ExpirationTime; // 鏈夋晥鏈熻嚦
model.StoreTime = data.StoreTime; // 鍌ㄥ瓨鏈熻嚦
+ model.ProductionTime = data.ProductionTime;//鐢熶骇鏃ユ湡
model.Qty = data.Qty;// 鏁伴噺
@@ -1252,6 +1267,7 @@
model1.ExpirationTime = data.ExpirationTime; // 鏈夋晥鏈熻嚦
model1.StoreTime = data.StoreTime; // 鍌ㄥ瓨鏈熻嚦
+ model1.ProductionTime = data.ProductionTime;//鐢熶骇鏃ユ湡
model1.Qty = dataList.Sum(m => m.Qty);// 鏁伴噺
model1.BoxNo = data.BoxNo; // 绠卞彿
@@ -1271,6 +1287,7 @@
model.ExpirationTime = data.ExpirationTime; // 鏈夋晥鏈熻嚦
model.StoreTime = data.StoreTime; // 鍌ㄥ瓨鏈熻嚦
+ model.ProductionTime = data.ProductionTime;//鐢熶骇鏃ユ湡
model.Qty = data.Qty;// 鏁伴噺
model.BoxNo = data.BoxNo3; // 鏀彿
@@ -1318,6 +1335,7 @@
model.ExpirationTime = boxData.ExpirationTime; // 鏈夋晥鏈熻嚦
model.StoreTime = boxData.StoreTime; // 鍌ㄥ瓨鏈熻嚦
+ model.ProductionTime = boxData.ProductionTime;//鐢熶骇鏃ユ湡
model.Qty = data.Sum(m => m.Qty); // 鏁伴噺
model.BoxNo = boxData.BoxNo; // 鏀彿
@@ -1340,6 +1358,7 @@
model1.ExpirationTime = item.ExpirationTime; // 鏈夋晥鏈熻嚦
model1.StoreTime = item.StoreTime; // 鍌ㄥ瓨鏈熻嚦
+ model1.ProductionTime = item.ProductionTime;//鐢熶骇鏃ユ湡
model1.Qty = item.Qty;// 鏁伴噺
model1.BoxNo = item.BoxNo3; // 鏀彿
@@ -1386,6 +1405,7 @@
model.ExpirationTime = boxData.ExpirationTime; // 鏈夋晥鏈熻嚦
model.StoreTime = boxData.StoreTime; // 鍌ㄥ瓨鏈熻嚦
+ model.ProductionTime = boxData.ProductionTime;//鐢熶骇鏃ユ湡
model.Qty = data.Sum(m => m.Qty); // 鏁伴噺
model.BoxNo = boxData.BoxNo; // 鏀彿
@@ -1410,6 +1430,7 @@
model1.ExpirationTime = item.ExpirationTime; // 鏈夋晥鏈熻嚦
model1.StoreTime = item.StoreTime; // 鍌ㄥ瓨鏈熻嚦
+ model.ProductionTime = item.ProductionTime;//鐢熶骇鏃ユ湡
model1.Qty = item.Qty; // 鏁伴噺
model1.BoxNo = item.BoxNo3; // 鏀彿
@@ -1478,6 +1499,7 @@
model.ExpirationTime = boxData.ExpirationTime; // 鏈夋晥鏈熻嚦
model.StoreTime = boxData.StoreTime; // 鍌ㄥ瓨鏈熻嚦
+ model.ProductionTime = boxData.ProductionTime;//鐢熶骇鏃ユ湡
model.Qty = data.Sum(m => m.Qty); // 鏁伴噺
model.BoxNo = boxData.BoxNo; // 鏀彿
@@ -1506,6 +1528,7 @@
model1.ExpirationTime = item.ExpirationTime; // 鏈夋晥鏈熻嚦
model1.StoreTime = item.StoreTime; // 鍌ㄥ瓨鏈熻嚦
+ model.ProductionTime = item.ProductionTime;//鐢熶骇鏃ユ湡
model1.Qty = item.Qty;// 鏁伴噺
model1.BoxNo = item.BoxNo3; // 鏀彿
diff --git a/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
index 5699ad4..43d8ab3 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
@@ -77,14 +77,15 @@
else
{
//浠庣墿鏂欏悕绉�-鎵规涓彇鍑烘壒娆�
- int indexOfDash = model.LotNo.IndexOf("-");
+ int indexOfDash = model.LotNo.IndexOf("=>");
if (indexOfDash != -1)
{
- model.LotNo = model.LotNo.Substring(indexOfDash + 1);
+ model.LotNo = model.LotNo.Substring(indexOfDash + 2);
}
else
{
- throw new Exception("鐗╂枡-鎵规涓嶅彲涓虹┖!");
+ model.LotNo = "";
+ //throw new Exception("鐗╂枡-鎵规涓嶅彲涓虹┖!");
}
}
@@ -531,7 +532,7 @@
#endregion
#region 璐ㄦ璇烽獙
- if ((notice.Type == "1" || notice.Type == "4" || notice.Type == "5") && sku.IsInspect != "1")
+ if ((notice.Type == "1" || notice.Type == "4" || notice.Type == "5") && sku.IsInspect != "1" && sku.IsControlled != "1")
{
var qualityRequest = Db.Queryable<BllQualityInspectionRequest>().First(m => m.IsDel == "0" && m.SkuNo == sku.SkuNo && m.LotNo == bind.LotNo && m.SupplierLot == bind.SupplierLot);
if (qualityRequest == null)
@@ -1047,7 +1048,7 @@
#endregion
#region 璐ㄦ璇烽獙
- if ((arrNotice.Type == "1" || arrNotice.Type == "4" || arrNotice.Type == "5") && sku.IsInspect != "1")
+ if ((arrNotice.Type == "1" || arrNotice.Type == "4" || arrNotice.Type == "5") && sku.IsInspect != "1" && sku.IsControlled != "1")
{
var qualityRequest = Db.Queryable<BllQualityInspectionRequest>().First(m => m.IsDel == "0" && m.SkuNo == sku.SkuNo && m.LotNo == bind.LotNo && m.SupplierLot == bind.SupplierLot);
if (qualityRequest == null)
@@ -1136,14 +1137,15 @@
else
{
//浠庣墿鏂欏悕绉�-鎵规涓彇鍑烘壒娆�
- int indexOfDash = model.LotNo.IndexOf("-");
+ int indexOfDash = model.LotNo.IndexOf("=>");
if (indexOfDash != -1)
{
- model.LotNo = model.LotNo.Substring(indexOfDash + 1);
+ model.LotNo = model.LotNo.Substring(indexOfDash + 2);
}
else
{
- throw new Exception("鐗╂枡鎵规涓嶅彲涓虹┖!");
+ model.LotNo = "";
+ //throw new Exception("鐗╂枡鎵规涓嶅彲涓虹┖!");
}
}
@@ -1497,7 +1499,7 @@
#endregion
#region 璐ㄦ璇烽獙
- if ((notice.Type == "1" || notice.Type == "4" || notice.Type == "5") && sku.IsInspect != "1")
+ if ((notice.Type == "1" || notice.Type == "4" || notice.Type == "5") && sku.IsInspect != "1" && sku.IsControlled != "1")
{
var qualityRequest = Db.Queryable<BllQualityInspectionRequest>().First(m => m.IsDel == "0" && m.SkuNo == sku.SkuNo && m.LotNo == bind.LotNo && m.SupplierLot == bind.SupplierLot);
if (qualityRequest == null)
@@ -2235,8 +2237,8 @@
if (boxNoList.Count > 0)
{
data.BoxNoList = boxNoList;
- data.Date1 = item.ProductionTime.ToString();
- data.Date2 = item.ExpirationTime.ToString();
+ data.Date1 = item.ProductionTime == null ? "" : Convert.ToDateTime(item.ProductionTime).ToString("yyyy-MM-dd");
+ data.Date2 = item.ExpirationTime == null ? "" : Convert.ToDateTime(item.ExpirationTime).ToString("yyyy-MM-dd");
break;
}
@@ -5964,7 +5966,7 @@
#endregion
#region 璐ㄦ璇烽獙
- if ((notice.Type == "1" || notice.Type == "4" || notice.Type == "5") && sku.IsInspect != "1")
+ if ((notice.Type == "1" || notice.Type == "4" || notice.Type == "5") && sku.IsInspect != "1" && sku.IsControlled != "1")
{
var qualityRequest = Db.Queryable<BllQualityInspectionRequest>().First(m => m.IsDel == "0" && m.SkuNo == sku.SkuNo && m.LotNo == bind.LotNo && m.SupplierLot == bind.SupplierLot);
if (qualityRequest == null)
diff --git a/Wms/WMS.BLL/BllQualityServer/QualityInspectServer.cs b/Wms/WMS.BLL/BllQualityServer/QualityInspectServer.cs
index f2de73b..7bed1a0 100644
--- a/Wms/WMS.BLL/BllQualityServer/QualityInspectServer.cs
+++ b/Wms/WMS.BLL/BllQualityServer/QualityInspectServer.cs
@@ -112,51 +112,59 @@
throw new Exception("鐗╂枡淇℃伅涓虹┖锛岃鏍告煡锛�");
}
//楠岃瘉鎵规鍙锋槸鍚︿负绌�
- if (string.IsNullOrEmpty(model.LotNo))
+ if (string.IsNullOrEmpty(model.LotNo) && string.IsNullOrEmpty(model.ASNNo))
{
- throw new Exception("鎵规鍙蜂笉鍙负绌猴紝璇锋牳鏌ワ紒");
+ throw new Exception("璇疯緭鍏ユ壒娆″彿鎴栧叆搴撳崟鍙凤紒");
}
//楠岃瘉鍏ュ簱鍗曞彿鏄惁涓虹┖
- if (string.IsNullOrEmpty(model.ASNNo))
- {
- throw new Exception("鍏ュ簱鍗曞彿涓嶅彲涓虹┖锛�");
+ //if (string.IsNullOrEmpty(model.ASNNo))
+ //{
+ // throw new Exception("鍏ュ簱鍗曞彿涓嶅彲涓虹┖锛�");
- //鏌ヨ鏄惁涓洪��璐у叆搴撳崟鎹�
- //var Arrival = Db.Queryable<BllArrivalNotice>().First(a => a.IsDel == "0" && a.ASNNo == model.ASNNo && a.Type == "3");
- //if (Arrival == null)
- //{
- // throw new Exception("鍙湁鍏ュ簱鍗曟嵁涓洪��璐у叆搴撳崟鍙緭鍏� 鍏ュ簱鍗曞彿锛岃鏍告煡锛�");
- //}
+ //鏌ヨ鏄惁涓洪��璐у叆搴撳崟鎹�
+ //var Arrival = Db.Queryable<BllArrivalNotice>().First(a => a.IsDel == "0" && a.ASNNo == model.ASNNo && a.Type == "3");
+ //if (Arrival == null)
+ //{
+ // throw new Exception("鍙湁鍏ュ簱鍗曟嵁涓洪��璐у叆搴撳崟鍙緭鍏� 鍏ュ簱鍗曞彿锛岃鏍告煡锛�");
+ //}
- ////鑾峰彇鍏ュ簱鍗曟槑缁�
- //var ArrivalDetail = Db.Queryable<BllArrivalNoticeDetail>().First(a => a.IsDel == "0" && a.ASNNo == model.ASNNo && a.LotNo.Contains(model.LotNo) && a.SkuNo == model.SkuNo);
- //if (ArrivalDetail == null)
- //{
- // throw new Exception("杈撳叆鐨勬壒娆℃垨鐗╂枡淇℃伅涓庡叆搴撳崟鎹笉绗︼紝璇锋牳鏌ワ紒");
- //}
- //isTui = 1;
- }
+ ////鑾峰彇鍏ュ簱鍗曟槑缁�
+ //var ArrivalDetail = Db.Queryable<BllArrivalNoticeDetail>().First(a => a.IsDel == "0" && a.ASNNo == model.ASNNo && a.LotNo.Contains(model.LotNo) && a.SkuNo == model.SkuNo);
+ //if (ArrivalDetail == null)
+ //{
+ // throw new Exception("杈撳叆鐨勬壒娆℃垨鐗╂枡淇℃伅涓庡叆搴撳崟鎹笉绗︼紝璇锋牳鏌ワ紒");
+ //}
+ //isTui = 1;
+ //}
//鏌ユ壘璐ㄦ淇℃伅涓槸鍚﹀瓨鍦ㄥ悓鎵规璐ㄦ褰曞叆璁板綍
//BllQualityInspect quality = Db.Queryable<BllQualityInspect>().First(m => m.IsDel == "0" && m.SkuNo == model.SkuNo && m.LotNo == model.LotNo);
//if (quality != null)
//{
- ////鍒ゆ柇鏄惁涓洪��璐у叆搴撳崟
- //if (isTui == 1)
- //{
- // if (quality.ASNNo == model.ASNNo)
- // {
- // throw new Exception("褰撳墠閫�璐у叆搴撳崟宸插垱寤鸿川妫�淇℃伅锛岃鍕块噸澶嶅垱寤猴紒");
- // }
- //}
+ ////鍒ゆ柇鏄惁涓洪��璐у叆搴撳崟
+ //if (isTui == 1)
+ //{
+ // if (quality.ASNNo == model.ASNNo)
+ // {
+ // throw new Exception("褰撳墠閫�璐у叆搴撳崟宸插垱寤鸿川妫�淇℃伅锛岃鍕块噸澶嶅垱寤猴紒");
+ // }
+ //}
// throw new Exception("褰撳墠鐗╂枡鍜屾壒娆″凡杩涜璐ㄦ锛岃鏍告煡锛�");
//}
////鏌ユ壘鍚屾壒娆� 鍚屽崟鎹� 鍏ュ簱鍗曚俊鎭��
- BllArrivalNoticeDetail arrivalDetail = Db.Queryable<BllArrivalNoticeDetail>().First(m => m.IsDel == "0"
- && m.ASNNo == model.ASNNo && m.LotNo == model.LotNo && m.SkuNo == model.SkuNo);
+ string sqlStr = $@"select * from BllArrivalNoticeDetail where IsDel='0' and SkuNo='{model.SkuNo}' ";
+ if (!string.IsNullOrEmpty(model.ASNNo))
+ {
+ sqlStr += $" and ASNNo='{model.ASNNo}' ";
+ }
+ if (!string.IsNullOrEmpty(model.LotNo))
+ {
+ sqlStr += $" and LotNo='{model.LotNo}' ";
+ }
+ BllArrivalNoticeDetail arrivalDetail = Db.SqlQueryable<BllArrivalNoticeDetail>(sqlStr).First();
if (arrivalDetail == null)
{
throw new Exception("鏈壘鍒板叆搴撳崟淇℃伅锛�");
@@ -170,10 +178,19 @@
model.PassQty = 0; //鍚堟牸鏁伴噺
model.FailQty = 0; //涓嶅悎鏍兼暟閲�
model.Standard = sku.Standard; //瑙勬牸
- //model.SupplierLot = arrivalDetail.SupplierLot; //渚涜揣鎵规
+ //model.SupplierLot = arrivalDetail.SupplierLot; //渚涜揣鎵规
//鏌ユ壘搴撳瓨鏄庣粏淇℃伅
- List<DataStockDetail> detail = Db.Queryable<DataStockDetail>().Where(m => m.IsDel == "0" && m.SkuNo == model.SkuNo && m.LotNo == model.LotNo).ToList();
+ string sqlStr2 = $@"select * from DataStockDetail where IsDel='0' and SkuNo='{model.SkuNo}' ";
+ if (!string.IsNullOrEmpty(model.ASNNo))
+ {
+ sqlStr2 += $" and ASNNo='{model.ASNNo}' ";
+ }
+ if (!string.IsNullOrEmpty(model.LotNo))
+ {
+ sqlStr2 += $" and LotNo='{model.LotNo}' ";
+ }
+ List<DataStockDetail> detail = Db.SqlQueryable<DataStockDetail>(sqlStr2).ToList();
foreach (var item in detail)
{
List<BllBoxInfo> box = Db.Queryable<BllBoxInfo>().Where(a => a.IsDel == "0" && a.SkuNo == model.SkuNo && a.LotNo == model.LotNo).ToList();
diff --git a/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs b/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
index 0322da7..361b515 100644
--- a/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
+++ b/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
@@ -3034,7 +3034,7 @@
foreach (var item in list)
{
var outModeLocate = "";
- if (outMode == "1")
+ if (outMode == "17")
{
if (i < outLocatelist1.Count)
{
@@ -3043,11 +3043,11 @@
else
{
var j = i % outLocatelist1.Count;
-
+
outModeLocate = outLocatelist1[j].LocatNo;
}
}
- else if(outMode == "2")
+ else if (outMode == "18")
{
if (i < outLocatelist1.Count)
{
@@ -3060,6 +3060,10 @@
outModeLocate = outLocatelist2[j].LocatNo;
}
}
+ else
+ {
+ throw new Exception("鍑哄簱鍙ｅ伐浣嶅紓甯�");
+ }
var taskNoStr = "";
diff --git a/Wms/WMS.BLL/DataServer/DataBoxInfoServer.cs b/Wms/WMS.BLL/DataServer/DataBoxInfoServer.cs
index 7d8f8b7..b94d8ee 100644
--- a/Wms/WMS.BLL/DataServer/DataBoxInfoServer.cs
+++ b/Wms/WMS.BLL/DataServer/DataBoxInfoServer.cs
@@ -38,7 +38,7 @@
string boxNo, string status, string inspectMark, string bitBoxMark, string inspectStatus)
{
string str = "select PalletNo,PalletNo2,PalletNo3,BoxNo,BoxNo2,BoxNo3,Status,LotNo,Qty,FullQty,SkuNo,SkuName," +
- "LotText,ProductionTime,InspectMark,BitBoxMark,InspectStatus,InspectTime from DataBoxInfo Where IsDel = @isdel";
+ "LotText,ProductionTime,ExpirationTime,InspectMark,BitBoxMark,InspectStatus,InspectTime from DataBoxInfo Where IsDel = @isdel";
//鍒ゆ柇id鏄惁涓虹┖
if (!string.IsNullOrEmpty(id))
{
diff --git a/Wms/WMS.BLL/DataServer/StockServer.cs b/Wms/WMS.BLL/DataServer/StockServer.cs
index 65e4416..4574a47 100644
--- a/Wms/WMS.BLL/DataServer/StockServer.cs
+++ b/Wms/WMS.BLL/DataServer/StockServer.cs
@@ -456,7 +456,7 @@
RQty = tb1.Qty,
RFactQty = tb1.Qty,
RCompleteQty = tb1.Qty,
- CompleteTime = tb1.CompleteTime,
+ CompleteTime = tb2.CreateTime,
LotText = tb1.LotText,
SupplierLot = tb2.SupplierLot,
@@ -498,7 +498,7 @@
SONo = tb2.SONo,
CTaskNo = tb1.TaskNo,
- CCreateTime = tb1.UpdateTime,
+ CCreateTime = tb1.CreateTime,
CQty = tb1.Qty,
CFactQty = tb1.Qty,
CAllotQty = tb1.Qty,
diff --git a/Wms/WMS.BLL/SysServer/CustomerServer.cs b/Wms/WMS.BLL/SysServer/CustomerServer.cs
index 4105f4b..0d8783c 100644
--- a/Wms/WMS.BLL/SysServer/CustomerServer.cs
+++ b/Wms/WMS.BLL/SysServer/CustomerServer.cs
@@ -41,7 +41,7 @@
.Includes(x => x.CreateUserInfo)
.Includes(x => x.UpdateUserInfo)
.ToListAsync();
- count = counts;
+ count.Value = counts;
return data.Select(m => new CustomerDto()
{
diff --git a/Wms/WMS.BLL/SysServer/PackagServer.cs b/Wms/WMS.BLL/SysServer/PackagServer.cs
index 4f7bca8..b898786 100644
--- a/Wms/WMS.BLL/SysServer/PackagServer.cs
+++ b/Wms/WMS.BLL/SysServer/PackagServer.cs
@@ -47,7 +47,8 @@
var data = await PackagRst.GetAllByOrderPage(item, limit, page, out int counts)
.Includes(x => x.CreateUserInfo)
.Includes(x => x.UpdateUserInfo).ToListAsync();
- count = counts;
+
+ count.Value = counts;
return data.Select(m => new PackagDto()
{
diff --git a/Wms/WMS.BLL/SysServer/UnitServer.cs b/Wms/WMS.BLL/SysServer/UnitServer.cs
index 47838d7..2a38430 100644
--- a/Wms/WMS.BLL/SysServer/UnitServer.cs
+++ b/Wms/WMS.BLL/SysServer/UnitServer.cs
@@ -44,7 +44,7 @@
var data = await UnitRst.GetAllByOrderPage(item, limit, page, out int counts)
.Includes(x => x.CreateUserInfo)
.Includes(x => x.UpdateUserInfo).ToListAsync();
- count = counts;
+ count.Value = counts;
return data.Select(m => new UnitDto()
{
Id = m.Id,
diff --git a/Wms/WMS.Entity/BllAsnEntity/BllArrivalNoticeDetail.cs b/Wms/WMS.Entity/BllAsnEntity/BllArrivalNoticeDetail.cs
index c8a1948..9953fda 100644
--- a/Wms/WMS.Entity/BllAsnEntity/BllArrivalNoticeDetail.cs
+++ b/Wms/WMS.Entity/BllAsnEntity/BllArrivalNoticeDetail.cs
@@ -171,6 +171,11 @@
public string Lot6 { get; set; }
/// <summary>
+ /// 鏍囩甯稿��
+ /// </summary>
+ public string BoxCodeStr { get; set; }
+
+ /// <summary>
/// 鑷畾涔夊垪1
/// </summary>
public string UDF1 { get; set; }
diff --git a/Wms/WMS.IBLL/IBllAsnServer/IArrivalNoticeServer.cs b/Wms/WMS.IBLL/IBllAsnServer/IArrivalNoticeServer.cs
index 5372da9..9e737c0 100644
--- a/Wms/WMS.IBLL/IBllAsnServer/IArrivalNoticeServer.cs
+++ b/Wms/WMS.IBLL/IBllAsnServer/IArrivalNoticeServer.cs
@@ -1,5 +1,6 @@
锘縰sing Model.InterFaceModel;
using Model.ModelDto;
+using Model.ModelDto.BllAsnDto;
using Model.ModelDto.SysDto;
using Model.ModelVm;
using Model.ModelVm.SysVm;
@@ -34,7 +35,7 @@
/// </summary>
/// <param name="id">id</param>
/// <returns></returns>
- string GetAsnDetailQtyList(int id);
+ LabelPrintInfoDto GetAsnDetailQtyList(int id);
/// <summary>
/// 鑾峰彇鐗╂枡淇℃伅锛堟坊鍔犲叆搴撳崟鏄庣粏浣跨敤锛�
diff --git a/Wms/Wms/Controllers/BasisController.cs b/Wms/Wms/Controllers/BasisController.cs
index 87c97b8..c93cd90 100644
--- a/Wms/Wms/Controllers/BasisController.cs
+++ b/Wms/Wms/Controllers/BasisController.cs
@@ -905,7 +905,7 @@
{
RefAsync<int> count = new RefAsync<int>();
var bolls = await _customerSvc.GetCustomerList(model.CustomerNo, model.CustomerName, model.Type, model.LinkMan, model.Phone, model.Page, model.Limit, count);
- return new SqlSugarPagedList() { Items = bolls, Total = count };
+ return new SqlSugarPagedList() { Items = bolls, Total = count.Value };
}
/// <summary>
/// 鏌ヨ鍗曟潯瀹㈡埛淇℃伅
@@ -1071,7 +1071,7 @@
{
RefAsync<int> count = new RefAsync<int>();
var list = await _unitSvc.GetUnitList(model.UnitNo, model.UnitName, model.Page, model.Limit, count);
- return new SqlSugarPagedList() { Items = list, Total = count };
+ return new SqlSugarPagedList() { Items = list, Total = count.Value };
}
/// <summary>
/// 鏌ヨ鍗曟潯鍗曚綅淇℃伅
@@ -1159,7 +1159,7 @@
{
RefAsync<int> count = new RefAsync<int>();
var list = await _packagSvc.GetPackagList(model.PackagNo, model.PackagName, model.Level, model.Page, model.Limit, count);
- return new SqlSugarPagedList { Items = list, Total = count };
+ return new SqlSugarPagedList { Items = list, Total = count.Value };
}
/// <summary>
diff --git a/Wms/Wms/appsettings.json b/Wms/Wms/appsettings.json
deleted file mode 100644
index f67b999..0000000
--- a/Wms/Wms/appsettings.json
+++ /dev/null
@@ -1,57 +0,0 @@
-{
- "Logging": {
- "LogLevel": {
- "Default": "Information",
- "Microsoft": "Warning",
- "Microsoft.Hosting.Lifetime": "Information"
- }
- },
- "AllowedHosts": "*",
- "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=192.168.62.106;Database=WMS_JC24;User ID=sa;Password=sql2019;Integrated Security=False;",
- //"ConnectionString": "Server=10.26.200.29;Database=WMS_JC34;User ID=sa;Password=boxline@2016;Integrated Security=False;",
- "ConnectionString": "Server=192.168.62.200;Database=WMS_JC34;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;"
- },
- "JWTConfig": {
- "Issuer": "WYY", //Token锟斤拷锟斤拷锟斤拷
- "Audience": "EveryTestOne", //Token锟斤拷锟斤拷锟斤拷
- "IssuerSigningKey": "WYY&YL889455200Sily", //锟斤拷钥锟斤拷锟皆癸拷锟斤拷锟斤拷锟斤拷锟斤拷锟较可碉拷token锟斤拷签锟斤拷锟斤拷钥锟斤拷锟斤拷锟斤拷锟斤拷16
- "AccessTokenExpiresMinutes": "600" //锟斤拷锟斤拷时锟斤拷 锟斤拷锟斤拷
- },
- "ApiUrlConfig": {
- "ErpHost": "http://10.110.24.30:8081", //erpIP
- "WcsHost": "http://10.26.254.34:5005", //wcsIPhttp://localhost:57061/
- "BoxHost": "http://10.110.24.30:8081", //boxIP
- "LimesHost": "http://10.110.24.30:8081", //LimesIP
-
- "IssueComApiUrl": "/api/openApi/wcsTasks", //涓嬪彂鍛戒护(鍑哄簱銆佺Щ搴�)
- "IssueComApiUrl2": "/api/openApi/wcsTask", //閲嶆柊涓嬪彂鍛戒护(鍑哄簱銆佺Щ搴�)
-
- "AsnFinishUrl": "/api/wmsInterface/OutStockTask", //鍏ュ簱璁㈠崟鍏抽棴
- "SoFinishUrl": "/api/wmsInterface/OutStockTask", //鍑哄簱璁㈠崟鍏抽棴
- "DataChangeUrl": "/api/wmsInterface/OutStockTask", //搴撳瓨鍙樻洿鍥炰紶
- "GetBoxUrl": "/api/wmsInterface/OutStockTask", //鑾峰彇绠辩爜淇℃伅
-
- "EditLocateUrl": "/api/WCSApi/EditLocatStatus", //鍚屾淇敼鍌ㄤ綅淇℃伅
-
- "SendInspection": ""//鍙戣捣璐ㄦLIMES
- },
- "SignConfig": {
- "ERPAppKey": "90170307d4184844ac2a26b431f79980", //ERP楠岀
- "MESAppKey": "90170307d4184844ac2a26b431f79981", //MES楠岀
- "LIMSAppKey": "90170307d4184844ac2a26b431f79982", //LIMS楠岀
- "FuMaAppKey": "90170307d4184844ac2a26b431f79983", //FuMa楠岀
- "Minutes": 5 //楠岀鏃堕棿 5鍒嗛挓
- },
- "Quartz": {
- "dbProviderName": "SqlServer",
- "connectionString": "Server=192.168.62.200;Database=WMS_JC34QRTZ;User ID=sa;Password=sql2019;Integrated Security=False;"
- //"connectionString": "Server=10.26.200.29;Database=WMS_JC34QRTZ;User ID=sa;Password=boxline@2016;Integrated Security=False;"
- }
-
-
-}
--
Gitblit v1.8.0