From f7309a5a1790d1c06ae4bffdde202d220f0007a2 Mon Sep 17 00:00:00 2001
From: chengsc <Demo@DESKTOP-CPA90BF>
Date: 星期三, 04 九月 2024 09:18:09 +0800
Subject: [PATCH] 修改问题
---
HTML/views/SOSetting/ExportAllot.html | 115 --------------------------------------
Wms/WMS.BLL/Logic/AllotSku.cs | 5 +
HTML/views/ASNSetting/ArrivalNotice.html | 10 ++-
HTML/views/ASNSetting/LabelPrint.html | 2
Wms/WMS.BLL/BllSoServer/CompleteDetailServer.cs | 5 +
Wms/Wms/Controllers/DownApiController.cs | 4
HTML/views/ASNSetting/LabelPrintSelect.html | 1
7 files changed, 18 insertions(+), 124 deletions(-)
diff --git a/HTML/views/ASNSetting/ArrivalNotice.html b/HTML/views/ASNSetting/ArrivalNotice.html
index 52a48ab..e74eaea 100644
--- a/HTML/views/ASNSetting/ArrivalNotice.html
+++ b/HTML/views/ASNSetting/ArrivalNotice.html
@@ -1210,7 +1210,9 @@
console.log(field);
//鎻愪氦 Ajax 鎴愬姛鍚庯紝闈欐�佹洿鏂拌〃鏍间腑鐨勬暟鎹�
//"&Level="+field.level+"&Type="+field.type+"&BoxType="+field.boxType+"&Qty="+field.qty+
- var str = "Id="+id+"&IsReset="+field.reset+"&ArriveQty="+field.arriveQty+"&ProductionTime="+field.productionTime+"&ExpirationTime="+field.expirationTime+"&StoreTime="+field.storeTime+"&SupplierLot="+field.SupplierLot;
+ var str = "Id="+id+"&IsReset="+field.reset+"&ArriveQty="+field.arriveQty
+ +"&ProductionTime="+field.productionTime+"&ExpirationTime="+field.expirationTime
+ +"&StoreTime="+field.storeTime+"&SupplierLot="+field.SupplierLot;
layer.open({
type: 2,
@@ -1233,7 +1235,7 @@
layer.open({
type: 2,
title: '鐢熸垚鏍囩',
- content: 'LabelPrintSelect.html?Id='+id+'&Type=4',
+ content: 'LabelPrintSelect.html?Id='+id+'&Type=4'+'&SupplierLot='+data.SupplierLot,
maxmin: true,
area: ['480px', '615px'],
btn: ['纭畾','鍙栨秷'],
@@ -1247,7 +1249,9 @@
console.log(field);
//鎻愪氦 Ajax 鎴愬姛鍚庯紝闈欐�佹洿鏂拌〃鏍间腑鐨勬暟鎹�
//"&Level="+field.level+"&Type="+field.type+"&BoxType="+field.boxType+"&Qty="+field.qty+
- var str = "Id="+id+"&IsReset="+field.reset+"&ArriveQty="+field.arriveQty+"&ProductionTime="+field.productionTime+"&ExpirationTime="+field.expirationTime+"&StoreTime="+field.storeTime;
+ var str = "Id="+id+"&IsReset="+field.reset+"&ArriveQty="+field.arriveQty
+ +"&ProductionTime="+field.productionTime+"&ExpirationTime="+field.expirationTime
+ +"&StoreTime="+field.storeTime+'&SupplierLot='+field.SupplierLot;
layer.open({
type: 2,
diff --git a/HTML/views/ASNSetting/LabelPrint.html b/HTML/views/ASNSetting/LabelPrint.html
index a17677f..9bd7c63 100644
--- a/HTML/views/ASNSetting/LabelPrint.html
+++ b/HTML/views/ASNSetting/LabelPrint.html
@@ -121,7 +121,7 @@
var supplierLot=getQueryString('SupplierLot'); //渚涜揣鎵规
$("#SupplierLot").html(supplierLot);
-
+ console.log(supplierLot);
var doing = true;
// console.log(productionTime);
// console.log(expirationTime);
diff --git a/HTML/views/ASNSetting/LabelPrintSelect.html b/HTML/views/ASNSetting/LabelPrintSelect.html
index 7e1d8e8..882b7c7 100644
--- a/HTML/views/ASNSetting/LabelPrintSelect.html
+++ b/HTML/views/ASNSetting/LabelPrintSelect.html
@@ -124,6 +124,7 @@
var id = getQueryString('Id');
var SupplierLot=getQueryString('SupplierLot');//渚涜揣鎵规
$('#SupplierLot').val(SupplierLot);
+ console.log(SupplierLot);
var asnType = getQueryString('Type');
console.log(asnType);
console.log(asnType == 4);
diff --git a/HTML/views/SOSetting/ExportAllot.html b/HTML/views/SOSetting/ExportAllot.html
index 24dfb71..60ef0e8 100644
--- a/HTML/views/SOSetting/ExportAllot.html
+++ b/HTML/views/SOSetting/ExportAllot.html
@@ -621,120 +621,7 @@
var DetailColsSysArr = encodeURIComponent(encodeURIComponent(JSON.stringify(DetailColsArr)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜
//#endregion
function refreshTablemx(val) {
- //#region 鍘熷闈炶嚜瀹氫箟鍒�
- // var param = {
- // Id: parseInt(val)
- // };
-
- // table.render({
- // elem: '#LAY-app-content-list2',
- // url: IP + "/BllSo/GetCompleteDetailList",
- // method: 'POST',
- // height: 'full-206',
- // id: 'LAY-app-content-list2',
- // where: param,
- // contentType: 'application/json',
- // headers: { ToKen: $.cookie('token') },
- // page: true,
- // limit: pageCnt,
- // limits: pageLimits,
- // cellMinWidth: 60, //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
- // done: function(){
- // initMenu();
- // },
- // cols: [
- // [{
- // title: '搴忓彿',
- // type: 'numbers',
- // width: 60,
- // fixed: 'left'
- // }, {
- // field: 'SONo',
- // title: '鍑哄簱鍗曞彿',
- // align: 'center',
- // fixed: 'left',
- // width: 180,
- // }, {
- // field: 'PalletNo',
- // title: '鎵樼洏鍙�',
- // align: 'center',
- // width: 95,
- // }, {
- // field: 'BoxNo',
- // title: '绠卞彿',
- // align: 'center',
- // width: 220,
- // }, {
- // field: 'BoxNo2',
- // title: '鐩掑彿',
- // align: 'center',
- // width: 115,
- // hide: true,
- // }, {
- // field: 'BoxNo3',
- // title: '鏀彿',
- // align: 'center',
- // width: 115,
- // hide: true,
- // }, {
- // field: 'SkuNo',
- // title: '鐗╂枡缂栫爜',
- // align: 'center',
- // width: 120,
- // }, {
- // field: 'SkuName',
- // title: '鐗╂枡鍚嶇О',
- // align: 'center',
- // }, {
- // field: 'LotNo',
- // title: '鎵规鍙�',
- // align: 'center',
- // width: 125,
- // }, {
- // field: 'CompleteQty',
- // title: '鎷ｈ揣鏁伴噺',
- // align: 'center',
- // width: 90,
- // }, {
- // field: 'NowPalletNo',
- // title: '鏂版墭鐩�',
- // align: 'center',
- // width: 95,
- // }, {
- // field: 'LotText',
- // title: '鎵规鎻忚堪',
- // align: 'center',
- // width: 150,
- // }, {
- // field: 'SupplierLot',
- // title: '渚涜揣鎵规',
- // align: 'center',
- // width: 110,
- // }, {
- // field: 'Standard',
- // title: '鐗╂枡瑙勬牸',
- // align: 'center',
- // width: 120,
- // }, {
- // field: 'CreateTime',
- // align: 'center',
- // title: '鍒涘缓鏃堕棿',
- // width: 165,
- // templet: function (d) {
- // return formatDate(d.CreateTime);
- // },
- // hide: true,
- // }, {
- // title: '鎿嶄綔',
- // fixed: 'right',
- // width: 90,
- // align: 'center',
- // toolbar: '#table-content-list2'
- // }]
- // ]
- // });
- //#endregion
-
+
//#region 鑷畾涔夎〃澶�
var colsJson2
var param1 = {
diff --git a/Wms/WMS.BLL/BllSoServer/CompleteDetailServer.cs b/Wms/WMS.BLL/BllSoServer/CompleteDetailServer.cs
index 15abb99..b16669b 100644
--- a/Wms/WMS.BLL/BllSoServer/CompleteDetailServer.cs
+++ b/Wms/WMS.BLL/BllSoServer/CompleteDetailServer.cs
@@ -26,8 +26,9 @@
try
{
var total = 0;
- var detailInfo = Db.Queryable<BllCompleteDetail>().First(w => string.IsNullOrEmpty(w.BoxNo) || string.IsNullOrEmpty(w.BoxNo3));
- if (detailInfo == null)
+ var detailInfo = Db.Queryable<BllCompleteDetail>().Where(w => w.ExportAllotId == id).ToList();
+ var num = detailInfo.Count(w=> string.IsNullOrEmpty(w.BoxNo) && !string.IsNullOrEmpty(w.BoxNo3));
+ if (detailInfo.Count>0 && num == 0) //绠辩爜鍜屾敮鐮侀兘涓虹┖鐨勬暟閲忕瓑涓�0 璇佹槑鏄鐮佹嫞璐�
{
Expression<Func<BllCompleteDetail, bool>> item = Expressionable.Create<BllCompleteDetail>()
.And(it => it.ExportAllotId == id)
diff --git a/Wms/WMS.BLL/Logic/AllotSku.cs b/Wms/WMS.BLL/Logic/AllotSku.cs
index fc6c23f..da7ef8b 100644
--- a/Wms/WMS.BLL/Logic/AllotSku.cs
+++ b/Wms/WMS.BLL/Logic/AllotSku.cs
@@ -757,7 +757,7 @@
item.Dept = int.Parse(dept);
}
//骞冲簱
- var locate1 = Db.Queryable<SysStorageLocat>().Where(m => m.IsDel == "0" && m.WareHouseNo == "W02");
+ var locate1 = Db.Queryable<SysStorageLocat>().Where(m => m.IsDel == "0" && m.WareHouseNo == "W02").ToList();
var data2 = new List<StockDetailDto>();
foreach (var liku in detail2.OrderBy(m => m.Dept).ToList())
{
@@ -779,7 +779,8 @@
}
//绔嬪簱
- var locate2 = Db.Queryable<SysStorageLocat>().Where(m => m.IsDel == "0" && m.WareHouseNo == "W01");
+ var locate2 = Db.Queryable<SysStorageLocat>().Where(m => m.IsDel == "0" && m.WareHouseNo == "W01").ToList();
+
var data3 = new List<StockDetailDto>();
foreach (var liku in detail3.OrderBy(m => m.Dept).ToList())
{
diff --git a/Wms/Wms/Controllers/DownApiController.cs b/Wms/Wms/Controllers/DownApiController.cs
index d38b5fb..99f3998 100644
--- a/Wms/Wms/Controllers/DownApiController.cs
+++ b/Wms/Wms/Controllers/DownApiController.cs
@@ -223,7 +223,7 @@
new OperationASNServer().AddLogOperationAsn("鍏ュ簱浣滀笟", "鍏ュ簱鏃ュ織", model.PalletNo.Substring(0, 8),
"鐢宠宸烽亾", $"鐢宠宸烽亾鎵樼洏鍙凤細{model.PalletNo.Substring(0, 8)}鐨勬垚鍔熶俊鎭�", 2);
- return Ok(new { Success = 0, Message = "鐢宠鍌ㄤ綅鎴愬姛", TaskList = list });
+ return Ok(new { Success = 0, Message = "鐢宠宸烽亾鎴愬姛", TaskList = list });
}
else
{
@@ -234,7 +234,7 @@
new OperationASNServer().AddLogOperationAsn("鍏ュ簱浣滀笟", "鍏ュ簱鏃ュ織", model.PalletNo.Substring(0, 8),
"鐢宠宸烽亾", $"鐢宠宸烽亾鎵樼洏鍙凤細{model.PalletNo.Substring(0, 8)}鐨勬垚鍔熶俊鎭�", 2);
- return Ok(new { Success = 0, Message = "鐢宠鍌ㄤ綅鎴愬姛", TaskList = list });
+ return Ok(new { Success = 0, Message = "鐢宠宸烽亾鎴愬姛", TaskList = list });
}
}
--
Gitblit v1.8.0