From 9176aaed52f030ccb9e00be157f893633153d1ca Mon Sep 17 00:00:00 2001
From: zhaowc <526854230@qq.com>
Date: 星期五, 30 八月 2024 08:55:53 +0800
Subject: [PATCH] PDA平库出库页根据出库单加载托盘所在位置
---
Wms/Model/ModelDto/PdaDto/PdaSoDto.cs | 2 +
Wms/WMS.Entity/BllSoEntity/BllExportAllot.cs | 6 +++
Wms/Wms/Controllers/PdaSoController.cs | 4 +-
Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs | 30 +++++++++++---
Pda/View/SoSetting/pingKuOut.html | 42 ++++++++++++++------
Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs | 1
6 files changed, 63 insertions(+), 22 deletions(-)
diff --git a/Pda/View/SoSetting/pingKuOut.html b/Pda/View/SoSetting/pingKuOut.html
index 3f8ed4a..92a28f8 100644
--- a/Pda/View/SoSetting/pingKuOut.html
+++ b/Pda/View/SoSetting/pingKuOut.html
@@ -110,19 +110,23 @@
<img src="/assets/fengexian.png">
</div>
- <div class="layout-tbl-paging" id="" style="display: none;">
+ <div class="layout-tbl-paging" id="" >
<table id="tableBoxList" class="tbl-box-list" border="" cellspacing="" cellpadding="">
<tr>
+ <th lang>鎵樼洏鐮�</th>
<th lang>鐗╂枡鍙�</th>
<th lang>鐗╂枡鍚嶇О</th>
<th lang>鎵规鍙�</th>
+ <th lang>搴撲綅鍦板潃</th>
+
</tr>
<tr id="boxCell" style="display: none">
- <!-- <td name="PalletNo">鎵樼洏鐮�</td> -->
+ <td name="PalletNo">鎵樼洏鐮�</td>
<td name="SkuNo">鐗╂枡鍙�</td>
<td name="SkuName">鐗╂枡鍚嶇О</td>
<td name="LotNo">鎵规鍙�</td>
+ <td name="LocatNo">搴撲綅鍦板潃</td>
<!-- <td name="del">
<div id="" class="tbl-btn-del" lang>
鍒犻櫎
@@ -182,29 +186,39 @@
//鍏堟洿鏂颁竴涓嬪嚭搴撳崟
updateBillList(function (data) {
$('select[id="bar"]').next().addClass('layui-form-selected')
-
$('select[id="bar"]').next().find('.layui-select-title input').val(val)
})
})
//鍒濆鍖栨覆鏌� 鍑哄簱鍗�
- function updateBillList() {
+ function updateBillList(callback) {
+ var input = $('select[id="bar"]').next().find('.layui-select-title input')
+ var val = input.val()
$("#bar").empty()
$("#bar").append('<option value =>' + '</option>');
form.render('select');
var PalletNo = $("#PalletNo").val();
- if(PalletNo == null && PalletNo == ""){ //涓嬫媺妗嗚幏鍙栧钩搴撳嚭搴撳崟
- synData(IP + "/PdaSo/GetSoNoticeList", 'post', function (res) {
+ if(PalletNo.length != 8){ //涓嬫媺妗嗚幏鍙栧钩搴撳嚭搴撳崟
+ var param = {
+ Type: "1",
+ };
+ synData(IP + "/PdaSo/GetRunNoticeList", param,'post', function (res) {
console.log(res);
if (res.code == 0) { //鎴愬姛
- console.log(res.data);
for (var i = 0; i < res.data.length; i++) {
- if (i == 0) {
- $("#bar").append('<option value =' + res.data[i] + ' selected>' + res.data[i] + '</option>');
- } else {
- $("#bar").append('<option value =' + res.data[i] + '>' + res.data[i] + '</option>');
- }
+ $("#bar").append('<option value =' + res.data[i] + '>' + res.data[i]
+ +
+ '</option>');
}
form.render('select');
+
+ if (!val) {
+ $('#bar').siblings("div.layui-form-select").find('dl').find('.layui-select-tips').addClass('layui-this')
+ } else {
+ var sel = 'dd[lay-value=' + val + ']';
+ $('#bar').siblings("div.layui-form-select").find('dl').find(sel).addClass('layui-this')
+ }
+
+ callback(res.data)
} else { //涓嶆垚鍔�
layer.msg(res.msg, {
@@ -285,16 +299,18 @@
var arrTrs = new Array()
let idx = 0
for (var i in list) {
+ console.log("list[i].LocatN:"+list[i].LocatNo);
// list[i].BoxCode
var tr = $("#boxCell").eq(0).clone();
tr.appendTo("#tableBoxList");
// tr.attr('id', list[i].BoxCode)
idx++;
tr.attr('index', idx)
- // tr.find("td[name='PalletNo']").html(list[i].PalletNo);
+ tr.find("td[name='PalletNo']").html(list[i].PalletNo);
tr.find("td[name='SkuNo']").html(list[i].SkuNo);
tr.find("td[name='SkuName']").html(list[i].SkuName);
tr.find("td[name='LotNo']").html(list[i].LotNo);
+ tr.find("td[name='LocatNo']").html(list[i].LocatNo);
// var code = list[i].BoxCode
// //console.log("code is "+code)
diff --git a/Wms/Model/ModelDto/PdaDto/PdaSoDto.cs b/Wms/Model/ModelDto/PdaDto/PdaSoDto.cs
index 7171287..5eed2ee 100644
--- a/Wms/Model/ModelDto/PdaDto/PdaSoDto.cs
+++ b/Wms/Model/ModelDto/PdaDto/PdaSoDto.cs
@@ -18,9 +18,11 @@
{
public string BoxNo { get; set; } // 绠辩爜/鏀爜
public decimal? Qty { get; set; } // 绠卞唴鏁伴噺
+ public string PalletNo { get; set; }
public string SkuNo { get; set; } // 鐗╂枡缂栫爜
public string SkuName { get; set; } // 鐗╂枡鍚嶇О
public string LotNo { get; set; } // 鎵规
+ public string LocatNo { get; set; }
public decimal? PickedQty { get; set; } // 绠卞唴宸叉嫞鏁伴噺
}
public class DetailIdSkuLotNo
diff --git a/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs b/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
index 33efe0f..b1b5f64 100644
--- a/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
+++ b/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
@@ -686,6 +686,7 @@
}
}
+
public List<BoxInfoDto> GetBoxInfoList(BoxInfoVm model, out int count)
{
try
diff --git a/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
index c5fe19d..4c54ba8 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
@@ -86,7 +86,7 @@
{
if (type == "1")//骞冲簱鍑哄簱鑾峰彇鍗曟嵁
{
- var allotList = await Db.Queryable<BllExportAllot>().Where(m => m.IsDel == "0" && m.Status == "1" ).Select(m => m.SONo).Distinct().Where(m => !string.IsNullOrWhiteSpace(m)).ToListAsync();
+ var allotList = await Db.Queryable<BllExportAllot>().Where(m => m.IsDel == "0" && (m.Status == "1" || m.Status =="0")).Select(m => m.SONo).Distinct().Where(m => !string.IsNullOrWhiteSpace(m)).ToListAsync();
return allotList;
}
//鑾峰彇鐘舵�佷负寰呮嫞璐ф垨鑰呴儴鍒嗘嫞璐х殑鍑哄簱鍗�
@@ -1194,18 +1194,34 @@
//鑾峰彇骞冲簱鎵樼洏淇℃伅
public async Task<List<BoxInfo>> GetPingKuInfoByPallet(string soNo, string palletNo)
{
- var info = Db.Queryable<BllExportAllot>().Where(m => m.SONo == soNo && m.PalletNo == palletNo && m.IsDel == "0");
+
+ var info = Db.Queryable<BllExportAllot>()
+ .LeftJoin<DataStockDetail>((a, b) => a.PalletNo == b.PalletNo)
+ .Where(a=>a.IsDel == "0" && (a.Status == "0"||a.Status =="1") && a.SONo == soNo)
+ .GroupBy((a,b) => new { a.SkuNo, a.SkuName, a.LotNo, a.PalletNo,b.LocatNo }).Select((a,b) => new BoxInfo()
+ {
+ PalletNo = a.PalletNo,
+ SkuNo = a.SkuNo,
+ SkuName = a.SkuName,
+ LotNo = a.LotNo,
+ LocatNo = b.LocatNo
+ }).ToListAsync();
+ var data = await info;
+
+ /*var a = info.First().LocatNo;
+
if (await info.CountAsync() == 0)
{
throw Oops.Bah("鏈煡璇㈠埌鎵樼洏鍒嗛厤涓嬪彂鐨勪俊鎭�");
}
- var data = await info.GroupBy(m => new { m.SkuNo, m.SkuName, m.LotNo }).Select(m => new BoxInfo()
+ var data = await info.GroupBy(a => new { a.SkuNo, a.SkuName, a.LotNo,a.PalletNo }).Select(a => new BoxInfo()
{
- SkuNo = m.SkuNo,
- SkuName = m.SkuName,
- LotNo = m.LotNo
- }).ToListAsync();
+ PalletNo = a.PalletNo,
+ SkuNo = a.SkuNo,
+ SkuName = a.SkuName,
+ LotNo = a.LotNo
+ }).ToListAsync();*/
return data;
}
diff --git a/Wms/WMS.Entity/BllSoEntity/BllExportAllot.cs b/Wms/WMS.Entity/BllSoEntity/BllExportAllot.cs
index 0718c18..0c8a94d 100644
--- a/Wms/WMS.Entity/BllSoEntity/BllExportAllot.cs
+++ b/Wms/WMS.Entity/BllSoEntity/BllExportAllot.cs
@@ -54,6 +54,12 @@
/// Nullable:True
/// </summary>
public string LotNo {get;set;}
+ /// <summary>
+ /// Desc:鍌ㄤ綅鍦板潃
+ /// Default:
+ /// Nullable:True
+ /// </summary>
+ public string LocatNo { get; set; }
/// <summary>
/// Desc:鎵规鎻忚堪
diff --git a/Wms/Wms/Controllers/PdaSoController.cs b/Wms/Wms/Controllers/PdaSoController.cs
index dc08249..3702a21 100644
--- a/Wms/Wms/Controllers/PdaSoController.cs
+++ b/Wms/Wms/Controllers/PdaSoController.cs
@@ -59,9 +59,9 @@
}
/// <summary>
- /// 鑾峰彇鍗曟嵁鍒楄〃
+ /// 鑾峰彇PDA骞冲簱鍑哄簱鍗曟嵁鍒楄〃
/// </summary>
- /// <param name=""></param>
+ /// <param name="type"></param>
/// <returns></returns>
[HttpPost]
public async Task<List<string>> GetRunNoticeList(PdaSoVm model)
--
Gitblit v1.8.0