From 7e7d83cee352eea6244901d1c46f1748a5820fee Mon Sep 17 00:00:00 2001
From: zhaowc <526854230@qq.com>
Date: 星期三, 28 八月 2024 08:16:53 +0800
Subject: [PATCH] Merge branch 'zwc'
---
.gitignore | 1 +
Pda/View/AsnSetting/productEnterQuantity.html | 5 ++---
Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/.gitignore b/.gitignore
index 3c4e34c..5bc2631 100644
--- a/.gitignore
+++ b/.gitignore
@@ -346,3 +346,4 @@
# BeatPulse healthcheck temp database
healthchecksdb
/Wms/Wms/Logs
+/鏁版嵁鏂囨。/JC26琛ㄧ粨鏋勬枃妗�.xlsx
diff --git a/Pda/View/AsnSetting/productEnterQuantity.html b/Pda/View/AsnSetting/productEnterQuantity.html
index 4bf23a3..c588260 100644
--- a/Pda/View/AsnSetting/productEnterQuantity.html
+++ b/Pda/View/AsnSetting/productEnterQuantity.html
@@ -856,8 +856,8 @@
$("#Standard").val("");
$("#ImportFactQuantity").val("");
$("#BoxQty").val("");
- $("#STOCKCODE").val("");
- $("#BOXCODE").val("");
+ // $("#STOCKCODE").val("");
+ // $("#BOXCODE").val("");
var param = {
Id: parseInt($("#goodSelect").val())
@@ -899,7 +899,6 @@
/* 缁戝畾鍏ュ簱鍗曠墿鏂欏強鎵规 */
function updateGoodList(skuNo) {
if (xianshiyemian == 0) {
- console.log("aaaa");
var input = $('select[id="goodSelect"]').next().find('.layui-select-title input')
var val = input.val()
diff --git a/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs b/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
index 7eaf41a..33efe0f 100644
--- a/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
+++ b/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
@@ -637,7 +637,7 @@
.LeftJoin<SysUserInfor>((a, b, c) => a.CreateUser == c.Id)
.LeftJoin<SysUserInfor>((a, b, c, d) => a.UpdateUser == d.Id)
.LeftJoin<SysStorageLocat>((a, b, c, d, e) => a.LocatNo == e.LocatNo)
- .LeftJoin<SysStorageArea>((a, b, c, d, e,f) => e.AreaNo == f.AreaNo)
+ .LeftJoin<SysWareHouse>((a, b, c, d, e,f) => e.WareHouseNo == f.WareHouseNo)
//.LeftJoin<BllBoxInfo>((a, b, c, d, e, f) => a.Id == e.BindNo)
.Select((a, b, c, d,e,f) => new PalletBindDto()
{
@@ -651,7 +651,7 @@
LocatNo = a.LocatNo,
RoadwayNo = a.RoadwayNo,
WareHouseNo = a.WareHouseNo,
- WareHouseName = f.AreaName,
+ WareHouseName = a.WareHouseNo+"-"+f.WareHouseName,
Qty = a.Qty,
FullQty = a.FullQty,
SamplingQty = a.SamplingQty,
--
Gitblit v1.8.0