From aa910d7bb5f164b1ce4782359a8eecddca103bdc Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-5BIMHQ3>
Date: 星期日, 04 二月 2024 09:56:27 +0800
Subject: [PATCH] 修改bug
---
Pda/View/AsnSetting/productEnter1.html | 6 +++---
HTML/views/ASNSetting/PalletBind.html | 4 ++--
Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs | 9 ++++++++-
3 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/HTML/views/ASNSetting/PalletBind.html b/HTML/views/ASNSetting/PalletBind.html
index 40eed28..09c9fa5 100644
--- a/HTML/views/ASNSetting/PalletBind.html
+++ b/HTML/views/ASNSetting/PalletBind.html
@@ -327,8 +327,8 @@
<script type="text/html" id="WareHouseButton">
{{#
switch (d.WareHouseNo) {
- case "W01": return '09浠撳簱';
- case "W02": return '09闆剁搴�';
+ case "W01": return '鍔涜绔嬩綋搴�';
+ case "W02": return '鍔涜骞冲簱';
default: return "";
}
diff --git a/Pda/View/AsnSetting/productEnter1.html b/Pda/View/AsnSetting/productEnter1.html
index c45e971..caaa38d 100644
--- a/Pda/View/AsnSetting/productEnter1.html
+++ b/Pda/View/AsnSetting/productEnter1.html
@@ -164,7 +164,7 @@
<tr>
<td>
<div id="" class="layui-form-item layout-boxinfo">
- <label class="layui-form-label" lang>鐗╂枡瑙勬牸锛�</label>
+ <label class="layui-form-label" lang>瑙勬牸/鍨嬪彿锛�</label>
<div class="layui-input-block">
<input id="Standard" type="text" disabled placeholder="" autocomplete="off"
class="layui-input">
@@ -975,9 +975,9 @@
yes: function () {
var param = {
- Id: Id,
+ boxNo: res.data[i].BoxNo,
};
- sendData(IP + "/BllAsn//DelBindBoxInfo'", param, 'post', function (res) {
+ sendData(IP + "/BllAsn/DelBindBoxInfo", param, 'get', function (res) {
if (res.code == 0) { //鎴愬姛
layer.msg(res.msg, {
icon: 1,
diff --git a/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
index 5a4b7df..ea55e4a 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
@@ -922,6 +922,8 @@
//淇敼缁勬墭鐘舵��
palletbindInfo.Status = "2"; //2 鍏ュ簱瀹屾垚
+ palletbindInfo.WareHouseNo = "W02";//鎵�灞炰粨搴�
+ palletbindInfo.LocatNo = model.LocatNo;//鍌ㄤ綅鍦板潃
palletbindInfo.UpdateTime = serverTime;
palletbindInfo.UpdateUser = model.CreateUser;
palletbindInfo.CompleteTime = serverTime; //瀹屾垚鏃堕棿
@@ -1087,7 +1089,12 @@
#endregion
#endregion
- }
+ }
+ storageLocat.Status = "1";
+ storageLocat.UpdateTime= serverTime; //淇敼鏃堕棿
+ storageLocat.UpdateUser = model.CreateUser; //淇敼浜�
+ //淇敼鍌ㄤ綅鐘舵��
+ Db.Updateable(storageLocat).ExecuteCommand();
new OperationASNServer().AddLogOperationAsn("PDA妯″潡", "骞冲簱鍏ュ簱", model.PalletNo, "瀹屾垚", $"鍦≒DA涓婂畬鎴愬崟鎹彿涓猴細{model.ASNNo}鐨勬墭鐩樼爜涓猴細{model.PalletNo}鐨勫钩搴撳叆搴撴搷浣�", (int)model.CreateUser);
--
Gitblit v1.8.0