From 0b3cbbee78cf76cc2f5cbd5d5f88b869fb29e537 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期三, 19 三月 2025 01:19:43 +0800
Subject: [PATCH] Merge branch 'master' of http://47.115.28.255:8110/r/TigerClouds-Tech/Server/TigerApi6_2024
---
Tiger.Business.WMS/Transaction/In_Default.cs | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/Tiger.Business.WMS/Transaction/In_Default.cs b/Tiger.Business.WMS/Transaction/In_Default.cs
index 2e04e35..9f0f1cd 100644
--- a/Tiger.Business.WMS/Transaction/In_Default.cs
+++ b/Tiger.Business.WMS/Transaction/In_Default.cs
@@ -23,7 +23,7 @@
{
public IIn_Default Init(string id, string userCode, string apiHost, string orgCode)
{
- base.Init(id, apiHost, userCode, orgCode);
+ base.Init(id, userCode, apiHost, orgCode);
Logger.Console.Info($"Start {this.GetType().Name} Transaction[ID: {TransID}]");
return this;
}
@@ -103,7 +103,7 @@
{
action.IsSuccessed = false;
//action.LocaleMsg = Biz.L("鐗╂枡缂栫爜[{0}]涓嶅瓨鍦ㄦ垨鑰呰鐗╂枡鏈惎鐢�");
- action.LocaleMsg = Biz.L("WMS.Default.ScanItem.ItemCodeNotExistsOrNotActive", inv.ItemInfo.ITEM_CODE.IsNullOrEmpty(inv.Barcode.ItemCode));
+ action.LocaleMsg = Biz.L("WMS.Default.ScanItem.ItemCodeNotExistsOrNotActive", inv.ItemInfo?.ITEM_CODE.IsNullOrEmpty(inv.Barcode.ItemCode));
return action;
}
@@ -181,13 +181,14 @@
CurInvItem = inv;
//妫�鏌ョ墿鏂欐暟閲忥紝濡傛灉娌℃湁鍒欐煡璇㈤泤杈炬潯鐮佷富妗ｏ紝鎶婃暟閲忚繑鍥炲墠绔‘璁�
- if (CurInvItem.Items.Any(q => q.QTY <= 0))
+ //if (CurInvItem.Items.Any(q => q.QTY <= 0))
{
var qtyList = Biz.DataSource["YadaU9C"].Client.Queryable<mes_MaterialBarCode>().Where(q => CurInvItem.Items.Select(q => q.SN).Contains(q.Code)).ToList();
foreach (var qty in qtyList)
{
var item = CurInvItem.Items.First(q => q.SN == qty.Code);
item.QTY = qty.WhQty;
+ item.SUPP_LOTNO = qty.Segment7;
}
action.Data.Data = CurInvItem.Items.Select(q => new { q.SN, q.QTY });
action.Data.Command = Command = "ComfirmQty";
@@ -426,8 +427,8 @@
//action.LocaleMsg = Biz.L($"鎵弿鏉＄爜[{0}]涓婃灦鍒板偍浣峓{1}]鎴愬姛");
action.LocaleMsg = Biz.L("WMS.Default.ScanItem.PutOnSucceeded", CurInvItem.SN, CurInvItem.Location.LOCATION_CODE);
- //閲嶇疆宸ュ簭
- ResetScan();
+ //閲嶇疆鎵爜淇℃伅
+ ResetScanInfo();
return action;
}
@@ -439,9 +440,17 @@
public override void ResetScan()
{
base.ResetScan();
+ ResetScanInfo();
+ CurScanShelf = null;
+ }
+
+ /// <summary>
+ /// 閲嶇疆鎵爜淇℃伅
+ /// </summary>
+ public void ResetScanInfo()
+ {
Command = null;
CurInvItem = null;
- CurScanShelf = null;
}
public override bool Close(bool needSaveHistoryLog = false)
--
Gitblit v1.9.3