From 83b9213dc893bec8f94e04cad121abb6649886dd Mon Sep 17 00:00:00 2001
From: chengsc <Demo@DESKTOP-CPA90BF>
Date: 星期日, 13 十月 2024 17:55:04 +0800
Subject: [PATCH] 修改业务需求问题
---
HTML/views/ASNSetting/ArrivalNoticeDetail.html | 8
Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs | 99 +++++++--
Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs | 4
Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs | 95 ++++++---
HTML/views/StatisticalReport/InventoryStatistics.html | 12
HTML/views/ASNSetting/ArrivalNotice.html | 328 --------------------------------
HTML/views/StatisticalReport/BoxInfor.html | 14
HTML/views/SOSetting/ExportNotice.html | 2
HTML/views/ASNSetting/LabelPrintSelect.html | 2
9 files changed, 159 insertions(+), 405 deletions(-)
diff --git a/HTML/views/ASNSetting/ArrivalNotice.html b/HTML/views/ASNSetting/ArrivalNotice.html
index 5383c31..417ecbe 100644
--- a/HTML/views/ASNSetting/ArrivalNotice.html
+++ b/HTML/views/ASNSetting/ArrivalNotice.html
@@ -438,148 +438,7 @@
var TotalColsSysArr=encodeURIComponent(encodeURIComponent(JSON.stringify(TotalColsArr)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜
//#endregion
function refreshTable() {
- //#region 鍘熷闈炶嚜瀹氫箟鍒�
- // var param = {
- // ASNNo: $("#ASNNo").val(),
- // Type: $("#Type").val(),
- // Status: $("#Status").val(),
- // CustomerName: $("#CustomerName").val(),
- // LotNo: $("#LotNo").val(),
- // SkuNo: $("#SkuNo").val(),
- // SkuName: $("#SkuName").val(),
- // StartTime:$("#StartTime").val(),
- // EndTime: $("#EndTime").val()
- // };
- // table.render({
- // elem: '#LAY-app-content-list',
- // url: IP + "/BllAsn/GetArrivalNoticeList",
- // method: 'POST',
- // height: h1,
- // id: 'LAY-app-content-list',
- // where: param,
- // contentType: 'application/json',
- // headers:{ToKen:$.cookie('token')},
- // page: true,
- // even: true,
- // limit: pageCnt,
- // limits: pageLimits,
- // cellMinWidth: 60, //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
- // done: function(res) {
- // setRight();
-
- // //aaa = $('#LAY-app-content-list').next().find('.layui-table-main').find('tr[data-index="0"]').find('td[data-field="ASNNo"]');
- // // refreshTablemx(res.data[0].ASNNo);
- // },
- // cols: [
- // [{
-
- // title: '搴忓彿',
- // type: 'numbers',
- // width: 50,
- // align: 'center',
- // fixed: 'left'
- // },
- // {
- // field: 'ASNNo',
- // title: '鍏ュ簱鍗曞彿',
- // align: 'center',
- // fixed: 'left',
- // sort: true,
- // width: 180
- // },
- // {
- // 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-danger layui-btn-xs">姝ｅ湪鎵ц</button>';
- // case "2" : return '<button class="layui-btn layui-btn-radius layui-btn-normal layui-btn-xs">鎵ц瀹屾瘯</button>';
- // case "3" : return '<button class="layui-btn layui-btn-radius layui-btn-normal layui-btn-xs">璁㈠崟鍏抽棴</button>';
- // default : return "";
- // }
- // }
- // },
- // {
- // field: 'Origin',
- // title: '鏉ユ簮',
- // align: 'center',
- // width: 80
- // },
- // {
- // field: 'CustomerName',
- // title: '瀹㈡埛鍚嶇О',
- // align: 'center'
- // },
- // {
- // field: 'Type',
- // title: '鍗曟嵁绫诲瀷',
- // align: 'center',
- // templet: function (d) {
- // switch (d.Type) {
- // case "0" : return "鏍囧噯浜у搧鍏ュ簱";
- // case "1" : return "闈炴爣浜у搧鍏ュ簱";
- // default : return "";
- // }
- // // JC08
- // // switch (d.Status) {
- // // case "0" : return "鎴愬搧鍏ュ簱";
- // // case "1" : return "鍘熸枡鍏ュ簱";
- // // case "2" : return "閫�璐у叆搴�";
- // // default : return "";
- // // }
- // }
- // },
- // {
- // field: 'CompleteTime',
- // title: '瀹屾垚鏃堕棿',
- // align: 'center',
- // hide:true,
- // templet: function (d) {
- // return formatDate2(d.CompleteTime);
- // }
- // },
- // {
- // field: 'CreateUserName',
- // title: '鍒涘缓浜�',
- // align: 'center',
- // width: 110
- // },
- // {
- // field: 'CreateTime',
- // title: '鍒涘缓鏃堕棿',
- // align: 'center',
- // templet: function (d) {
- // return formatDate(d.CreateTime);
- // }
- // },
- // {
- // field: 'UpdateUserName',
- // title: '淇敼浜�',
- // align: 'center',
- // hide:false,
- // width: 110
- // },
- // {
- // field: 'UpdateTime',
- // title: '淇敼鏃堕棿',
- // align: 'center',
- // hide:false,
- // templet: function (d) {
- // return formatDate(d.UpdateTime);
- // }
- // }, {
- // title: '鎿嶄綔',
- // fixed: 'right',
- // width: 240,
- // align: 'center',
- // toolbar: '#toolbarDemo1'
- // }]
- // ]
- // });
- //#endregion
-
+
//#region 鑷畾涔夎〃澶�
var colsJson
var param1={
@@ -642,8 +501,8 @@
{field: 'SkuNo',title: '鐗╂枡缂栫爜',align: 'center',width: 100},
{field: 'SkuName',title: '鐗╂枡鍚嶇О',align: 'center',width: 200},
{field: 'Standard',title: '鐗╂枡瑙勬牸',align: 'center',width: 130},
- {field: 'LotNo',title: '鎵规鍙�',align: 'center',width: 100},
- {field: 'SupplierLot',title: '渚涜揣鎵规',align: 'center',width: 100},
+ {field: 'LotNo',title: '杩涘巶缂栧彿',align: 'center',width: 100},
+ {field: 'SupplierLot',title: '鍘熷巶鎵瑰彿',align: 'center',width: 100},
{field: 'Qty',title: '鏁伴噺',align: 'center',width: 70},
{field: 'FactQty',title: '宸茬粍鏁伴噺',align: 'center',width: 90},
{field: 'CompleteQty',title: '瀹屾垚鏁伴噺',align: 'center',width: 90},
@@ -670,186 +529,7 @@
var DetailColsSysArr=encodeURIComponent(encodeURIComponent(JSON.stringify(DetailColsArr)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜
//#endregion
function refreshTablemx(asnNo) {
- //#region 鍘熷闈炶嚜瀹氫箟鍒�
- // var param = {
- // ASNNo:asnNo
- // };
- // table.render({
- // elem: '#LAY-app-content-list2',
- // url: IP + "/BllAsn/GetArrivalNoticeDetailList",
- // method: 'POST',
- // height: h2,
- // id: 'LAY-app-content-list2',
- // where: param,
- // contentType: 'application/json',
- // toolbar:'#toolbarDemo',
- // defaultToolbar: ['filter'], //'print', 'exports'
- // headers:{ToKen:$.cookie('token')},
- // page: true,
- // limit: pageCnt,
- // limits: pageLimits,
- // cellMinWidth: 60, //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
- // done: function() {
- // setRight()
- // },
- // cols: [
- // [{
-
- // title: '搴忓彿',
- // type: 'numbers',
- // width: 50,
- // align: 'center',
- // fixed: 'left'
- // },
- // {
- // field: 'ASNNo',
- // title: '鍏ュ簱鍗曞彿',
- // align: 'center',
- // fixed: 'left',
- // sort: true,
- // width: 180
- // },
- // {
- // field: 'SkuNo',
- // title: '鐗╂枡缂栫爜',
- // align: 'center',
- // width: 100
- // }, {
- // field: 'SkuName',
- // title: '鐗╂枡鍚嶇О',
- // align: 'center',
- // width: 200
- // }, {
- // field: 'Standard',
- // title: '鐗╂枡瑙勬牸',
- // align: 'center',
- // width: 130
- // }, {
- // field: 'LotNo',
- // title: '鎵规鍙�',
- // align: 'center',
- // width: 100
- // },{
- // field: 'SupplierLot',
- // title: '渚涜揣鎵规',
- // align: 'center',
- // fixed: 'right',
- // width: 100,
- // hide:true
- // }, {
- // field: 'Qty',
- // title: '鏁伴噺',
- // align: 'center',
- // width: 70
- // }, {
- // field: 'FactQty',
- // title: '宸茬粍鏁伴噺',
- // align: 'center',
- // width: 90
- // }, {
- // field: 'CompleteQty',
- // title: '瀹屾垚鏁伴噺',
- // align: 'center',
- // width: 90
- // },
- // {
- // field: 'CompleteTime',
- // title: '瀹屾垚鏃堕棿',
- // align: 'center',
- // width: 160,
- // templet: function (d) {
- // return formatDate(d.CompleteTime);
- // }
- // },
- // {
- // field: 'UnitName',
- // title: '璁￠噺鍗曚綅',
- // align: 'center',
- // width: 90
- // },
- // {
- // field: 'Price',
- // title: '鍗曚环',
- // align: 'center',
- // width: 65,
- // hide:true
- // }, {
- // field: 'Money',
- // title: '閲戦',
- // align: 'center',
- // width: 65,
- // hide:true
- // },
- // {
- // field: 'LotText',
- // title: '鎵规鎻忚堪',
- // align: 'center',
- // width: 120
- // },{
- // field: 'PackagName',
- // title: '鍖呰鍚嶇О',
- // align: 'center',
- // width: 110,
- // }, {
- // field: 'IsBale',
- // title: '鏄惁瑁瑰寘',
- // align: 'center',
- // width: 150,
- // hide:true
- // }, {
- // field: 'IsBelt',
- // title: '鏄惁鎵撳甫',
- // align: 'center',
- // width: 150,
- // hide:true
- // },{
- // field: 'CreateUserName',
- // title: '鍒涘缓浜�',
- // align: 'center',
- // width: 100
- // },
- // {
- // field: 'CreateTime',
- // title: '鍒涘缓鏃堕棿',
- // align: 'center',
- // width: 160,
- // templet: function (d) {
- // return formatDate(d.CreateTime);
- // }
- // },
- // // {
- // // field: 'Id',
- // // title: '鍏ュ簱鏄庣粏Id',
- // // align: 'center',
- // // hide: true,
- // // width: 150,
- // // },
- // {
- // field: 'UpdateUserName',
- // title: '淇敼浜�',
- // align: 'center',
- // hide:true,
- // width: 150,
- // },
- // {
- // field: 'UpdateTime',
- // title: '淇敼鏃堕棿',
- // align: 'center',
- // hide:true,
- // width: 150,
- // templet: function (d) {
- // return formatDate(d.UpdateTime);
- // }
- // }, {
- // title: '鎿嶄綔',
- // fixed: 'right',
- // width: 100,
- // align: 'left',
- // toolbar: '#toolbarDemoList'
- // }]
- // ]
- // });
- //#endregion
+
//#region 鑷畾涔夎〃澶�
var colsJson2
diff --git a/HTML/views/ASNSetting/ArrivalNoticeDetail.html b/HTML/views/ASNSetting/ArrivalNoticeDetail.html
index 3b3f5ec..0775cc6 100644
--- a/HTML/views/ASNSetting/ArrivalNoticeDetail.html
+++ b/HTML/views/ASNSetting/ArrivalNoticeDetail.html
@@ -168,8 +168,8 @@
{ field: 'Id', title: '鍏ュ簱鍗曟槑缁咺D', width: 120, align: 'center', fixed: 'left', hide: true, "disabled": true },
{ field: 'SkuNo', title: '鐗╂枡缂栫爜', minWidth: 100, align: 'center', fixed: 'left', "disabled": true },
{ field: 'SkuName', title: '鐗╂枡鍚嶇О', minWidth: 180, align: 'center', fixed: 'left', "disabled": true },
- { field: 'LotNo', title: '鎵规鍙�', align: 'center', edit: 'text', minWidth: 130, fixed: 'left', "disabled": true },
- { field: 'SupplierLot', title: '渚涜揣鎵规', width: 130, edit: 'text', event: 'setSign', fixed: 'left', "disabled": true },
+ { field: 'LotNo', title: '杩涘巶缂栧彿', align: 'center', edit: 'text', minWidth: 130, fixed: 'left', "disabled": true },
+ { field: 'SupplierLot', title: '鍘熷巶鎵瑰彿', width: 130, edit: 'text', event: 'setSign', fixed: 'left', "disabled": true },
{ field: 'Qty', title: '鏁伴噺', align: 'center', width: 80, edit: 'number', event: 'dataNumber', fixed: 'left', "disabled": true },
{ field: 'UnitName', title: '璁￠噺鍗曚綅', align: 'center', width: 70 },
{ field: 'Standard', title: '瑙勬牸', width: 160, align: 'center' },
@@ -182,7 +182,7 @@
{ field: 'UDF3', title: '鑷畾涔夊垪3', align: 'center', edit: 'text', width: 140 },
{ field: 'UDF4', title: '鑷畾涔夊垪4', align: 'center', edit: 'text', width: 140 },
{ field: 'UDF5', title: '鑷畾涔夊垪5', align: 'center', width: 140, templet: '#templetUDF5' },
- { field: 'caozuo', title: '鎿嶄綔', fixed: 'right', width: 100, align: 'center', templet: '#table-content-list', "disabled": true }
+ { field: 'caozuo', title: '鎿嶄綔', fixed: 'right', width: 170, align: 'center', templet: '#table-content-list', "disabled": true }
]];
var TotalColsSysArr = encodeURIComponent(encodeURIComponent(JSON.stringify(TotalColsArr)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜
//#endregion
@@ -665,7 +665,7 @@
}
else if (TypeNum == 1) {
if (res.data[i].Type == 1) {
- $("#CustomerNamep").html("渚涘簲鍟�");
+ $("#CustomerNamep").html("鐢熶骇鍟�");
$("#CustomerName").append('<option value =' + res.data[i].CustomerNo + '>' +
res.data[i].CustomerName + '</option>');
}
diff --git a/HTML/views/ASNSetting/LabelPrintSelect.html b/HTML/views/ASNSetting/LabelPrintSelect.html
index 882b7c7..09fa573 100644
--- a/HTML/views/ASNSetting/LabelPrintSelect.html
+++ b/HTML/views/ASNSetting/LabelPrintSelect.html
@@ -39,7 +39,7 @@
<label class="layui-form-label">閲嶇疆鎵瑰彿</label>
<div class="layui-input-block">
<select name="reset" id="reset" lay-filter="reset" lay-verify="required">
- <option value="1">鏄�</option>
+ <!-- <option value="1">鏄�</option> -->
<option value="0">鍚�</option>
</select>
</div>
diff --git a/HTML/views/SOSetting/ExportNotice.html b/HTML/views/SOSetting/ExportNotice.html
index 0860965..f1becef 100644
--- a/HTML/views/SOSetting/ExportNotice.html
+++ b/HTML/views/SOSetting/ExportNotice.html
@@ -337,7 +337,7 @@
var html = '';
if(d.IsWave == '0'){
if(d.Status == '0' || d.Status == '1' ){
- if(d.Type != "8") {
+ if(d.Type != "8" && d.Type != "2" && d.Type != "3") {
html += `<a class="layui-btn layui-btn-normal layui-btn-xs zifenClass" lay-event="auto">
<i class="layui-icon layui-icon-ok"></i>鑷姩鍒嗛厤
</a>`;
diff --git a/HTML/views/StatisticalReport/BoxInfor.html b/HTML/views/StatisticalReport/BoxInfor.html
index ccb5ce0..79a54ca 100644
--- a/HTML/views/StatisticalReport/BoxInfor.html
+++ b/HTML/views/StatisticalReport/BoxInfor.html
@@ -65,9 +65,9 @@
</div>
</div>
<div class="layui-inline mingxi">
- <label class="layui-form-label" style="width: 60px;">鎵规鍙�</label>
+ <label class="layui-form-label" style="width: 60px;">杩涘巶缂栧彿</label>
<div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
- <input type="text" id="LotNo" name="LotNo" placeholder="鎵规鍙�" autocomplete="off" class="layui-input">
+ <input type="text" id="LotNo" name="LotNo" placeholder="杩涘巶缂栧彿" autocomplete="off" class="layui-input">
</div>
</div>
@@ -402,11 +402,11 @@
{field: 'SkuName', title: '鐗╂枡鍚嶇О', align: 'center'},
{field: 'OwnerNo',title: '璐т富缂栫爜',align: 'center'},
{field: 'OwnerName',title: '璐т富鍚嶇О',align: 'center'},
- {field: 'SupplierNo',title: '渚涘簲鍟嗙紪鐮�',align: 'center'},
- {field: 'SupplierName',title: '渚涘簲鍟嗗悕绉�',align: 'center'},
- {field: 'LotNo', title: '鎵规鍙�', align: 'center'},
+ {field: 'SupplierNo',title: '鐢熶骇鍟嗙紪鐮�',align: 'center'},
+ {field: 'SupplierName',title: '鐢熶骇鍟嗗悕绉�',align: 'center'},
+ {field: 'LotNo', title: '杩涘巶缂栧彿', align: 'center'},
{field: 'LotText', title: '鎵规鎻忚堪', align: 'center'},
- {field: 'SupplierLot', title: '渚涜揣鎵规', align: 'center'},
+ {field: 'SupplierLot', title: '鍘熷巶鎵瑰彿', align: 'center'},
{field: 'Qty', title: '鏁伴噺', align: 'center'},
{field: 'LockQty', title: '閿佸畾鏁伴噺', align: 'center',},
{field: 'FrozenQty', title: '鍐荤粨鏁伴噺', align: 'center'},
@@ -567,7 +567,7 @@
{field: 'PalletNo', title: '鎵樼洏鍙�', align: 'center', width: 110},
{field: 'BoxNo', title: '绠辩爜', align: 'center', width: 100},
{field: 'Status', title: '绠辨敮鐘舵��', align: 'center', templet: '#BoxStatus'},
- {field: 'LotNo', title: '鎵规鍙�', align: 'center'},
+ {field: 'LotNo', title: '杩涘巶缂栧彿', align: 'center'},
{field: 'LotText', title: '鎵规鎻忚堪', align: 'center'},
{field: 'Qty', title: '鏁伴噺', width: 90, align: 'center'},
{field: 'FullQty', title: '鏁寸鏁伴噺', width: 100, align: 'center'},
diff --git a/HTML/views/StatisticalReport/InventoryStatistics.html b/HTML/views/StatisticalReport/InventoryStatistics.html
index 878f85c..d3ec89e 100644
--- a/HTML/views/StatisticalReport/InventoryStatistics.html
+++ b/HTML/views/StatisticalReport/InventoryStatistics.html
@@ -65,9 +65,9 @@
</div>
</div>
<div class="layui-inline mingxi">
- <label class="layui-form-label" style="width: 60px;">鎵规鍙�</label>
+ <label class="layui-form-label" style="width: 60px;">杩涘巶缂栧彿</label>
<div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
- <input type="text" id="LotNo" name="LotNo" placeholder="鎵规鍙�" autocomplete="off"
+ <input type="text" id="LotNo" name="LotNo" placeholder="杩涘巶缂栧彿" autocomplete="off"
class="layui-input">
</div>
</div>
@@ -357,7 +357,7 @@
{field: 'SkuNo',title: '鐗╂枡缂栫爜',align: 'center',totalRowText: "鍚堣:", "disabled": true},
{field: 'SkuName',title: '鐗╂枡鍚嶇О',align: 'center', "disabled": true},
{field: 'Standard',title: '鐗╂枡瑙勬牸',align: 'center', "disabled": true},
- {field: 'LotNo',title: '鎵规鍙�',align: 'center', "disabled": true},
+ {field: 'LotNo',title: '杩涘巶缂栧彿',align: 'center', "disabled": true},
{field: 'LotText',title: '鎵规鎻忚堪',align: 'center'},
{field: 'OwnerNo',title: '璐т富缂栫爜',align: 'center'},
{field: 'OwnerName',title: '璐т富鍚嶇О',align: 'center'},
@@ -530,11 +530,11 @@
{field: 'SkuNo',title: '鐗╂枡缂栫爜',width: 100,align: 'center'},
{field: 'SkuName',title: '鐗╂枡鍚嶇О',align: 'center'},
{field: 'Standard',title: '鐗╂枡瑙勬牸',width: 130,align: 'center'},
- {field: 'LotNo',title: '鎵规鍙�',align: 'center'},
+ {field: 'LotNo',title: '杩涘巶缂栧彿',align: 'center'},
{field: 'OwnerNo',title: '璐т富缂栫爜',align: 'center'},
{field: 'OwnerName',title: '璐т富鍚嶇О',align: 'center'},
- {field: 'SupplierNo',title: '渚涘簲鍟嗙紪鐮�',align: 'center'},
- {field: 'SupplierName',title: '渚涘簲鍟嗗悕绉�',align: 'center'},
+ {field: 'SupplierNo',title: '鐢熶骇鍟嗙紪鐮�',align: 'center'},
+ {field: 'SupplierName',title: '鐢熶骇鍟嗗悕绉�',align: 'center'},
{field: 'Qty',title: '搴撳瓨鏁伴噺',width: 110,align: 'center'},
{field: 'LockQty',title: '閿佸畾鏁伴噺',width: 110,align: 'center'},
{field: 'Status',templet: '#buttonTpl',title: '搴撳瓨鐘舵��',width: 90,align: 'center'},
diff --git a/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs b/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
index 34dfe6f..b91e930 100644
--- a/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
+++ b/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
@@ -20,6 +20,8 @@
using WMS.BLL.SysServer;
using System.Threading.Tasks;
using System.Security.Policy;
+using WMS.Entity.DataEntity;
+using WMS.Entity.BllQualityEntity;
namespace WMS.BLL.BllAsnServer
{
@@ -262,7 +264,7 @@
string sqlString = string.Empty;
string sqlDetailStr = string.Empty;
//0锛氭垚鍝佸叆搴� 1锛氶噰璐叆搴� 2锛氫腑闂村搧鍏ュ簱 3锛氶��璐у叆搴� 4锛氳溅闂翠綑鏂欏叆搴� 5锛氬叾瀹冨叆搴� 6锛氫唬鍌ㄥ叆搴� 7锛氬瘎瀛樺叆搴�
- var TypeLot = "1, 2, 5, 6, 7"; //鎵规鍙负绌哄崟鎹被鍨�
+ var TypeLot = "2, 5, 6, 7"; //鎵规鍙负绌哄崟鎹被鍨�
var addOder = new List<ResponseOrderTaskModel>();
try
@@ -284,13 +286,13 @@
}
//鍒ゆ柇鏄惁涓洪噰璐叆搴撳崟鎹垨杞﹂棿浣欐枡閫�鍥炲叆搴�
// 0锛氭垚鍝佸叆搴� 1锛氶噰璐叆搴� 2锛氫腑闂村搧鍏ュ簱 3锛氶��璐у叆搴� 4锛氳溅闂翠綑鏂欓��鍥炲叆搴� 5锛氬叾瀹冨叆搴� 6锛氫唬鍌ㄥ叆搴� 7锛氬瘎瀛樺叆搴�
- if (model.Type == "1" || model.Type == "4")
- {
- if (!string.IsNullOrWhiteSpace(model.LotNo))
- {
- throw new Exception("閲囪喘鍏ュ簱鎴栦綑鏂欓��鍥炰笉鍙緭鍏ユ壒娆★紝涓嶅彲缂栬緫!");
- }
- }
+ //if (model.Type == "1" || model.Type == "4")
+ //{
+ // if (!string.IsNullOrWhiteSpace(model.LotNo))
+ // {
+ // throw new Exception("閲囪喘鍏ュ簱鎴栦綑鏂欓��鍥炰笉鍙緭鍏ユ壒娆★紝涓嶅彲缂栬緫!");
+ // }
+ //}
sqlString += "Insert into BllArrivalNotice (ASNNo,Type,Origin,CustomerNo,";
sqlString += "CustomerName,LotNo,LotText,SupplierLot,CreateUser) values ( ";
@@ -320,9 +322,19 @@
//鍒ゆ柇鏄惁涓轰笉闄愬埗鎵规鍗曟嵁
if (!TypeLot.Contains(model.Type))
{
- strMessage = "-1:鎵规鍙蜂笉鍙负绌�;";
+ strMessage = "-1:杩涘巶缂栧彿涓嶅彲涓虹┖;";
continue;
}
+ }
+ if (detailModel.LotNo.Length!= 10)
+ {
+ strMessage = "-1:杩涘巶缂栧彿浣嶆暟闀垮害鏈夎;";
+ continue;
+ }
+ if (model.Type == "1" && string.IsNullOrWhiteSpace(detailModel.SupplierLot)) //閲囪喘鍒拌揣鍗曞師鍘傛壒鍙凤紙渚涜揣鎵规锛変笉鑳戒负绌�
+ {
+ strMessage = "-1:鍘熷巶鎵瑰彿涓嶅彲涓虹┖;";
+ continue;
}
// 鍒ゆ柇鏄惁宸插瓨鍦ㄥ綋鍓嶆槑缁�
string sqlCount = $"SELECT COUNT(ID) FROM BllArrivalNoticeDetail where ASNNo = '{model.ASNNo}' ";
@@ -330,7 +342,7 @@
var com = new Common().GetRowCount(sqlCount);
if (com > 0)
{
- strMessage = "-1:鐗╂枡鍜屾壒娆″彿閲嶅;";
+ strMessage = "-1:鐗╂枡鍜岃繘鍘傜紪鍙烽噸澶�;";
continue;
}
if (detailModel.Price == null)
@@ -345,7 +357,7 @@
sqlDetailStr += $"'{detailModel.LotNo}','{detailModel.LotText}','{detailModel.Qty}','{detailModel.PackagNo}','{detailModel.Price}', ";
sqlDetailStr += $"{detailModel.Money},'{detailModel.IsBale}','{detailModel.IsBelt}','{detailModel.SupplierLot}','0','{detailModel.UDF1}','{detailModel.UDF2}','{detailModel.UDF3}','{detailModel.UDF4}','{detailModel.UDF5}','{model.CreateUser}');";
- if (model.Type == "1")
+ if (model.Type == "0")//鎴愬搧鍏ュ簱鍗曚笅鍙慦CS淇℃伅
{
addOder.Add(new ResponseOrderTaskModel()
{
@@ -377,34 +389,34 @@
{
new OperationASNServer().AddLogOperationAsn("鍏ュ簱浣滀笟", "鍏ュ簱鍗曟嵁", model.ASNNo, "娣诲姞", $"娣诲姞浜嗗崟鎹彿涓簕model.ASNNo}鐨勫崟鎹俊鎭�", Convert.ToInt32(model.CreateUser));
- if (addOder.Count > 0)
- {
- // 姝ｅ紡杩愯绋嬪簭鏀惧紑
- var jsonData = JsonConvert.SerializeObject(addOder);
- string response = "";
+ //if (addOder.Count > 0)
+ //{
+ // // 姝ｅ紡杩愯绋嬪簭鏀惧紑
+ // var jsonData = JsonConvert.SerializeObject(addOder);
+ // string response = "";
- try
- {
- var time1 = DateTime.Now;//鍙戦�佹椂闂� .ToString("yyyy-MM-dd HH:mm:ss")
- //缁橶CS涓嬪彂鍏ュ簱鍗曚俊鎭�
- response = HttpHelper.DoPost(url, jsonData, "涓嬪彂缁橶CS鍑哄簱鍛戒护", "WCS");
+ // try
+ // {
+ // var time1 = DateTime.Now;//鍙戦�佹椂闂� .ToString("yyyy-MM-dd HH:mm:ss")
+ // //缁橶CS涓嬪彂鍏ュ簱鍗曚俊鎭�
+ // response = HttpHelper.DoPost(url, jsonData, "涓嬪彂缁橶CS鍑哄簱鍛戒护", "WCS");
- //////瑙ｆ瀽杩斿洖鏁版嵁
- var wcsModel = JsonConvert.DeserializeObject<WcsModel>(response);
- if (wcsModel.StatusCode == 0)
- {
+ // //////瑙ｆ瀽杩斿洖鏁版嵁
+ // var wcsModel = JsonConvert.DeserializeObject<WcsModel>(response);
+ // if (wcsModel.StatusCode == 0)
+ // {
- }
- if (wcsModel.StatusCode == -1)
- {
+ // }
+ // if (wcsModel.StatusCode == -1)
+ // {
- }
- }
- catch (Exception ex)
- {
- throw new Exception(ex.Message);
- }
- }
+ // }
+ // }
+ // catch (Exception ex)
+ // {
+ // throw new Exception(ex.Message);
+ // }
+ //}
return strMessage;
}
else
@@ -1053,6 +1065,19 @@
{
throw new Exception("澶嶆牳澶辫触锛屽鏍镐汉鍛樺拰鍏抽棴璁㈠崟浜哄憳涓嶈兘鐩稿悓锛�");
}
+ //鍗曟嵁绫诲瀷鏄� 鎴愬搧鍏ュ簱鎴栭噰璐叆搴� 鍒ゆ柇鍏ュ簱鐗╂枡鏄惁鍚堟牸
+ if (notice.Type == "0" || notice.Type == "1")
+ {
+ foreach (var item in detail)
+ {
+ var instStatus = Db.Queryable<BllQualityInspect>().Count(m => m.IsDel == "0" && m.SkuNo == item.SkuNo && m.LotNo == item.LotNo && m.IsQualified == "1");
+ if (instStatus == 0)
+ {
+ throw new Exception($"{item.SkuNo}銆亄item.LotNo}璐ㄩ噺鐘舵�佷笉鏄悎鏍肩殑锛屼笉鑳藉洖浼狅紒");
+ }
+ }
+
+ }
var list = new List<AsnDetail>();
foreach (var d in detail)
{
diff --git a/Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs b/Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs
index d1d0140..de6e0ad 100644
--- a/Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs
+++ b/Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs
@@ -15,6 +15,7 @@
using WMS.Entity.Context;
using WMS.Entity.SysEntity;
using WMS.IBLL.IBllAsnServer;
+using ZXing;
namespace WMS.BLL.BllAsnServer
{
@@ -532,14 +533,47 @@
public List<BllBoxInfo> AddLabelBox(int imId, string isReset, decimal arriveQty, string productionTime, string expirationTime, string storeTime,string supplierLot, int userId)
{
try
- {
+ {
#region 鍗曟嵁銆佺墿鏂欍�佸寘瑁呫�佹爣绛句俊鎭幏鍙�
-
+ if (string.IsNullOrWhiteSpace(productionTime))
+ {
+ throw new Exception("鐢熶骇鏃ユ湡涓嶈兘涓虹┖");
+ }
+ if (!string.IsNullOrWhiteSpace(expirationTime) && !string.IsNullOrWhiteSpace(storeTime))
+ {
+ throw new Exception("鏈夋晥鏈熷拰鍌ㄥ瓨鏈熶笉鑳藉悓鏃跺～鍐�");
+ }
+ if (isReset != "0")
+ {
+ throw new Exception("涓嶅彲閲嶇疆鎵规");
+ }
+ DateTime proTime;
+ DateTime expTime;
+ DateTime stoTime;
+ var bl1= DateTime.TryParse(productionTime, out proTime);
+ var bl2= DateTime.TryParse(expirationTime, out expTime);
+ var bl3= DateTime.TryParse(storeTime, out stoTime);
+ if (!bl1)
+ {
+ throw new Exception("鐢熶骇鏃ユ湡杞崲澶辫触");
+ }
+ if (!bl2 && !string.IsNullOrWhiteSpace(expirationTime))
+ {
+ throw new Exception("鏈夋晥鏈熻浆鎹㈠け璐�");
+ }
+ if (!bl3 && !string.IsNullOrWhiteSpace(storeTime))
+ {
+ throw new Exception("鍌ㄥ瓨鏈熻浆鎹㈠け璐�");
+ }
var asnList = Db.Queryable<BllArrivalNoticeDetail>().First(m => m.Id == imId && m.IsDel == "0");
if (asnList == null)
{
throw new Exception("鏈煡璇㈠埌鍗曟嵁鏄庣粏淇℃伅");
+ }
+ if (asnList.LotNo.Length != 10)
+ {
+ throw new Exception("鍗曟嵁杩涘巶缂栧彿浣嶆暟闀垮害閿欒");
}
var asn = Db.Queryable<BllArrivalNotice>().First(m => m.ASNNo == asnList.ASNNo && m.IsDel == "0");
if (asn == null)
@@ -681,19 +715,19 @@
{
throw new Exception("褰撳墠鍗曟嵁鏄庣粏杩樻湭鐢熸垚鏍囩锛岃閫夋嫨閲嶇疆鎵规閫夐」涓衡�樻槸鈥欙紱");
}
- maxLotNoStr = labelCount.Max(a => a.LotNo);
-
- if (string.IsNullOrWhiteSpace(maxLotNoStr))
- {
- maxLotNoStr = toDayTime.Substring(2, 6) + "0001";
- }
- maxBoxCode = label.Where(m => m.LotNo == maxLotNoStr).Max(a => a.BoxNo);
+ //maxLotNoStr = labelCount.Max(a => a.LotNo);
+ maxLotNoStr = asnList.LotNo;
+ //if (string.IsNullOrWhiteSpace(maxLotNoStr))
+ //{
+ // maxLotNoStr = toDayTime.Substring(2, 6) + "0001";
+ //}
+ //maxBoxCode = label.Where(m => m.LotNo == maxLotNoStr).Max(a => a.BoxNo);
}
}
else
{
- var maxCode = Db.Queryable<BllBoxInfo>().Where(m=>m.Origin == "WMS鐢熸垚").Max(a => a.LotNo); // 鑾峰彇浠婂ぉ鏈�澶ф壒娆″彿
+ var maxCode = Db.Queryable<BllBoxInfo>().Where(m=>m.Origin == "WMS鐢熸垚").Max(a => a.LotNo); // 鑾峰彇浠婂ぉ鏈�澶ф壒娆″彿 20241013
if (string.IsNullOrWhiteSpace(maxCode))
{
maxLotNoStr = toDayTime.Substring(2, 6) + "0001";
@@ -770,15 +804,20 @@
BitBoxMark = bNum > boxQty ? "1":"0",
InspectStatus = "0",
- ProductionTime = DateTime.Parse(productionTime),
- StoreTime = DateTime.Parse(storeTime),
- ExpirationTime = DateTime.Parse(expirationTime),
-
+ ProductionTime = proTime,
+
Origin = "WMS鐢熸垚",
CreateUser = userId,
CreateTime = DateTime.Now,
};
-
+ if (bl2)
+ {
+ labelModel.ExpirationTime = expTime;
+ }
+ if (bl3)
+ {
+ labelModel.StoreTime = stoTime;
+ }
Db.Insertable(labelModel).ExecuteCommand();
modelList.Add(labelModel);
}
@@ -847,14 +886,15 @@
{
throw new Exception("褰撳墠鍗曟嵁鏄庣粏杩樻湭鐢熸垚鏍囩锛岃閫夋嫨閲嶇疆鎵规閫夐」涓衡�樻槸鈥欙紱");
}
- maxCodestr2 = labelCount.Max(a => a.LotNo); ;
+ //maxCodestr2 = labelCount.Max(a => a.LotNo); ;
+ maxCodestr2 = asnList.LotNo;
- if (string.IsNullOrWhiteSpace(maxCodestr2))
- {
- maxCodestr2 = toDayTime2.Substring(2, 6) + "0001";
- }
- maxboxcode2 = label.Where(m => m.LotNo == maxCodestr2).Max(a => a.BoxNo);//绠卞彿;
- maxboxcode3 = label.Where(m => m.LotNo == maxCodestr2).Max(a => a.BoxNo3);//鏀彿;
+ //if (string.IsNullOrWhiteSpace(maxCodestr2))
+ //{
+ // maxCodestr2 = toDayTime2.Substring(2, 6) + "0001";
+ //}
+ //maxboxcode2 = label.Where(m => m.LotNo == maxCodestr2).Max(a => a.BoxNo);//绠卞彿;
+ //maxboxcode3 = label.Where(m => m.LotNo == maxCodestr2).Max(a => a.BoxNo3);//鏀彿;
}
}
@@ -985,15 +1025,20 @@
BitBoxMark = bNum > boxQty ? "1" : "0",
InspectStatus = "0",
- ProductionTime = DateTime.Parse(productionTime),
- StoreTime = DateTime.Parse(storeTime),
- ExpirationTime = DateTime.Parse(expirationTime),
-
+ ProductionTime = proTime,
+
Origin = "WMS鐢熸垚",
CreateUser = userId,
CreateTime = DateTime.Now,
};
-
+ if (bl2)
+ {
+ labelModel.ExpirationTime = expTime;
+ }
+ if (bl3)
+ {
+ labelModel.StoreTime = stoTime;
+ }
Db.Insertable(labelModel).ExecuteCommand();
modelList.Add(labelModel);
}
diff --git a/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs b/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
index 2aab36e..e02d6f0 100644
--- a/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
+++ b/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
@@ -2161,6 +2161,10 @@
{
str += "3.瑕佸嚭搴撶殑鎵樼洏姝ｅ湪鍏ュ簱銆�";
}
+ if (string.IsNullOrWhiteSpace(str))
+ {
+ str += "鎵樼洏鍙墽琛岋紝鏃犻渶涓嬪彂鍑哄簱浠诲姟";
+ }
if (outDto1.Count > 0)
{
// 姝ｅ紡杩愯绋嬪簭鏀惧紑
--
Gitblit v1.8.0