From 2192dd5a99d182f301451be72a64428246968d01 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期二, 11 三月 2025 16:23:37 +0800
Subject: [PATCH] 增加收货单上架事务
---
Tiger.Api/Language.db | 0
Tiger.IBusiness.WMS/Transaction/IIn_BIZ_U9_RECEIPT.cs | 4
Tiger.Business.WMS/Transaction/Yada/In_BIZ_U9_RECEIPT.cs | 189 +++++++++++++++++------------------------------
Tiger.Model.Net/Entitys/WMS/BIZ_U9_RECEIPT_DTL.cs | 13 ++-
4 files changed, 79 insertions(+), 127 deletions(-)
diff --git a/Tiger.Api/Language.db b/Tiger.Api/Language.db
index 4361b20..a53d097 100644
--- a/Tiger.Api/Language.db
+++ b/Tiger.Api/Language.db
Binary files differ
diff --git a/Tiger.Business.WMS/Transaction/Yada/In_BIZ_U9_ASN.cs b/Tiger.Business.WMS/Transaction/Yada/In_BIZ_U9_RECEIPT.cs
similarity index 70%
rename from Tiger.Business.WMS/Transaction/Yada/In_BIZ_U9_ASN.cs
rename to Tiger.Business.WMS/Transaction/Yada/In_BIZ_U9_RECEIPT.cs
index 71659e3..981f686 100644
--- a/Tiger.Business.WMS/Transaction/Yada/In_BIZ_U9_ASN.cs
+++ b/Tiger.Business.WMS/Transaction/Yada/In_BIZ_U9_RECEIPT.cs
@@ -11,17 +11,16 @@
using Tiger.IBusiness;
using Tiger.Model.Sharetronic.Shelf;
using Tiger.Business.WMS.Sharetronic.Shelf;
-//using Microsoft.IdentityModel.Tokens;
-using Tiger.Model.MES.Yada;
+using static IronPython.Modules._ast;
namespace Tiger.Business.WMS.Transaction
{
/// <summary>
- /// 閫佽揣鍗�(U9)涓婃灦浜嬪姟
+ /// 鏀惰揣鍗�(U9)涓婃灦浜嬪姟
/// </summary>
- public class In_BIZ_U9_ASN : WmsTask, IIn_BIZ_U9_ASN
+ public class In_BIZ_U9_RECEIPT : WmsTask, IIn_BIZ_U9_RECEIPT
{
- public IIn_BIZ_U9_ASN Init(string id, string userCode, string apiHost, string orgCode)
+ public IIn_BIZ_U9_RECEIPT Init(string id, string userCode, string apiHost, string orgCode)
{
base.Init(id, apiHost, userCode, orgCode);
Logger.Console.Info($"Start {this.GetType().Name} Transaction[ID: {TransID}]");
@@ -91,7 +90,7 @@
var inv = result.Data as Inventory;
//楠岃瘉鏉＄爜鏄惁姝ｇ‘
- if (new[] { WMS_ITEM.STATUSs.InStore, WMS_ITEM.STATUSs.Loaded, WMS_ITEM.STATUSs.UseUp }.Contains(inv.Status))
+ if (!inv.isNormalStatus || inv.Status != WMS_ITEM.STATUSs.WaitIn)
{
action.IsSuccessed = false;
//action.LocaleMsg = Biz.L("鐘舵�乕{0}]寮傚父锛岃閲嶆柊鎵弿");
@@ -106,123 +105,32 @@
action.LocaleMsg = Biz.L("WMS.Default.ScanItem.ItemCodeNotExistsOrNotActive", inv.ItemInfo.ITEM_CODE.IsNullOrEmpty(inv.Barcode.ItemCode));
return action;
}
-
- if (inv.Items.Count == 0)
- {
- List<WMS_ITEM_HIS> ItemHistorys = new List<WMS_ITEM_HIS>();
- WMS_ITEM Item;
- WMS_ITEM_PKG ItemPkgs;
-
- Item = new()
- {
- SN = inv.Barcode.SN,
- ITEM_CODE = inv.Barcode.ItemCode,
- AUTH_ORG = input.AuthOption.CurOrg,
- STATUS = WMS_ITEM.STATUSs.WaitIn.GetValue(),
- QTY = inv.Barcode.Qty.ToDouble(),
- PROD_DATE = inv.Barcode.DateCode.ToDateTime(),
- ERP_WH = CurScanShelf.WarehouseCode,
- UNIT = inv.Barcode.Unit,
- };
-
- WMS_ITEM_HIS his = new(Item, $"鏍囧噯涓婃灦鍏ュ簱");
- ItemHistorys.Add(his);
- ItemPkgs = new()
- {
- SN = inv.Barcode.SN,
- AUTH_ORG = input.AuthOption.CurOrg,
- ITEM_CODE = inv.Barcode.ItemCode,
- QTY = inv.Barcode.Qty.ToDouble(),
- ERP_WH = CurScanShelf.WarehouseCode,
- UNIT = inv.Barcode.Unit,
- };
-
- var noExt = inv.Items.Where(q => !inv.ItemsExt.Any(s => s.SN == q.SN)).ToList();
- //鎵╁睍琛ㄤ笉瀛樺湪鏃舵柊寤�
- foreach (var item in noExt)
- {
- inv.ItemsExt.Add(new()
- {
- SN = item.SN,
- META_SN = inv.Barcode.MetaSn,
- QR_CODE = inv.Barcode.MetaSn
- });
- }
-
- inv.Items.Add(Item);
- inv.History.Add(his);
- inv.Packages.Add(ItemPkgs);
- }
- //闆呰揪涓嶄粠鏉＄爜涓婃洿鏂版暟閲�
- //else if (inv.Items.Count == 1)
- //{
- // inv.Items.First().QTY = inv.Barcode.Qty.ToDouble();
- // inv.Items.First().ERP_WH = CurScanShelf.WarehouseCode;
- // inv.Items.First().AUTH_ORG = input.AuthOption.CurOrg;
-
- // inv.Packages.First().QTY = inv.Barcode.Qty.ToDouble();
- // inv.Packages.First().ERP_WH = CurScanShelf.WarehouseCode;
- // inv.Packages.First().AUTH_ORG = input.AuthOption.CurOrg;
- //}
- //濡傛灉鎵弿澶栫鐨勪笉鑳芥洿鏂版暟閲�
- else
- {
- foreach (var item in inv.Items)
- {
- item.ERP_WH = CurScanShelf.WarehouseCode;
- item.AUTH_ORG = input.AuthOption.CurOrg;
- }
- foreach (var item in inv.Packages)
- {
- item.ERP_WH = CurScanShelf.WarehouseCode;
- item.AUTH_ORG = input.AuthOption.CurOrg;
- }
- }
CurInvItem = inv;
-
- //妫�鏌ョ墿鏂欐暟閲忥紝濡傛灉娌℃湁鍒欐煡璇㈤泤杈炬潯鐮佷富妗ｏ紝鎶婃暟閲忚繑鍥炲墠绔‘璁�
- 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;
- }
- action.Data.Data = CurInvItem.Items.Select(q => new { q.SN, q.QTY });
- action.Data.Command = Command = "ComfirmQty";
- //action.LocaleMsg = Biz.L("璇风‘璁ゆ潯鐮乕{0}]鐨勬暟閲忔槸鍚︽纭�");
- action.LocaleMsg = Biz.L("WMS.Default.ScanItem.ComfirmQty", input.SN);
- return action;
- }
}
- //鏇存柊宸茬‘璁ょ墿鏂欐暟閲�
- if (Command == "ComfirmQty")
+ var receipt = await Biz.Db.Queryable<BIZ_U9_RECEIPT>().Where(q => q.ORDER_NO == CurInvItem.Items.First().TRANS_NO).IncludesAllFirstLayer().FirstAsync();
+ if (receipt.IsNullOrEmpty())
{
- var qtyList = (input.Data ?? "").JsonToObject<List<WMS_ITEM>>() ?? new List<WMS_ITEM>();
- if (!qtyList.Any() || qtyList.Any(q => q.QTY <= 0))
- {
- action.IsSuccessed = false;
- action.Data.Data = CurInvItem.Items.Select(q => new { q.SN, q.QTY });
- action.Data.Command = Command = "ComfirmQty";
- //action.LocaleMsg = Biz.L("鏁伴噺涓嶈兘灏忎簬绛変簬闆讹紝璇烽噸鏂扮‘璁ゆ潯鐮乕{0}]鐨勬暟閲�");
- action.LocaleMsg = Biz.L("WMS.Default.ScanItem.ReComfirmQty", input.SN);
- return action;
- }
- else
- {
- foreach (var qty in qtyList)
- {
- var item = CurInvItem.Items.First(q => q.SN == qty.SN);
- item.QTY = qty.QTY;
- var pkg = CurInvItem.Packages.First(q => q.SN == qty.SN);
- pkg.QTY = qty.QTY;
- }
- CurInvItem.UpdatePkgQty();
-
- Command = "Normal";
- }
+ action.IsSuccessed = false;
+ //action.LocaleMsg = Biz.L("鏀惰揣鍗曚腑鎵句笉鍒版潯鐮佹墍灞炵殑鍗曟嵁[{0}]淇℃伅锛岃閲嶆柊鎵弿鏀惰揣鍗曠殑鏉＄爜鎴栭�夋嫨姝ｇ‘鐨勫姛鑳戒笂鏋�");
+ action.LocaleMsg = Biz.L("WMS.In_BIZ_U9_RECEIPT.ScanItem.ReceiptNotExists", CurInvItem.Items.First().TRANS_NO);
+ return action;
+ }
+ var receiptDtl = receipt.Details.First(q => q.LINE_NO == CurInvItem.Items.First().TRANS_LINE);
+ if (receiptDtl.STATUS > BIZ_U9_RECEIPT.STATUSs.Storing.GetValue())
+ {
+ action.IsSuccessed = false;
+ //action.LocaleMsg = Biz.L("鏀惰揣鍗曚腑琛孾{0}]鐘舵�乕{1}]寮傚父锛岃鎵弿姝ｇ‘鐨勬潯鐮�");
+ action.LocaleMsg = Biz.L("WMS.In_BIZ_U9_RECEIPT.ScanItem.ReceiptDtlStatusException", receiptDtl.LINE_NO, receiptDtl.STATUS.GetEnumDesc<BIZ_U9_RECEIPT.STATUSs>());
+ return action;
+ }
+ var receiptSn = receipt.SnList.First(q => q.SN == CurInvItem.SN);
+ if (receiptSn.STATUS != WMS_ITEM.STATUSs.WaitIn.GetValue())
+ {
+ action.IsSuccessed = false;
+ //action.LocaleMsg = Biz.L("鏀惰揣鍗曚腑鏉＄爜[{0}]鐘舵�乕{1}]寮傚父锛岃鎵弿姝ｇ‘鐨勬潯鐮�");
+ action.LocaleMsg = Biz.L("WMS.In_BIZ_U9_RECEIPT.ScanItem.ReceiptSnStatusException", receiptSn.SN, receiptSn.STATUS.GetEnumDesc<WMS_ITEM.STATUSs>());
+ return action;
}
var nLocation = new WMS_LOCATION();
@@ -282,8 +190,12 @@
//鎵ц涓婃灦鏁版嵁澶勭悊
foreach (var item in CurInvItem.Items)
{
- item.TRANS_CODE = "In_Default";
- item.TRANS_NO = $"In_Default_{DateTime.Now:yyyyMMdd}";
+ item.SOURCE_CODE = item.TRANS_CODE;
+ item.SOURCE_ORDER = item.TRANS_NO;
+ item.SOURCE_LINE = item.TRANS_LINE;
+ item.TRANS_CODE = nameof(BIZ_U9_RECEIPT);
+ item.TRANS_NO = receipt.ORDER_NO;
+ item.TRANS_LINE = receiptDtl.LINE_NO;
}
Result putonResult = PutOn(input.AuthOption, nLocation.LOCATION_CODE);
if (!putonResult.IsSuccessed)
@@ -294,6 +206,41 @@
return action;
}
+ //鏇存柊鍗曟嵁淇℃伅
+ receiptSn.STATUS = WMS_ITEM.STATUSs.InStore.GetValue();
+ receiptSn.IS_IN = "Y";
+ //濡傛灉褰撳墠琛屼笂鏋跺畬鎴愭爣璁颁负寰呭鏍�
+ receiptDtl.QTY_IN = receipt.SnList.Where(q => q.LINE_NO == receiptDtl.LINE_NO).Sum(q => q.QTY);
+ if (receiptDtl.QTY_IN == receiptDtl.QTY)
+ {
+ receiptDtl.STATUS = BIZ_U9_RECEIPT.STATUSs.Review.GetValue();
+ }
+ else
+ {
+ receiptDtl.STATUS = BIZ_U9_RECEIPT.STATUSs.Storing.GetValue();
+ }
+ var dtlStatus = receipt.Details.Select(q => q.STATUS).Distinct();
+ if (dtlStatus.Count() == 1 && dtlStatus.First() == BIZ_U9_RECEIPT.STATUSs.Review.GetValue())
+ {
+ receipt.STATUS = BIZ_U9_RECEIPT.STATUSs.Review.GetValue();
+ }
+ else
+ {
+ receipt.STATUS = BIZ_U9_RECEIPT.STATUSs.Storing.GetValue();
+ }
+
+ //鍒涘缓鍙橀噺鍏嬮殕瀵硅薄鐢ㄤ簬浼犲叆DBSubmitAction涓繚瀛樺綋鍓嶉渶瑕佹殏瀛樼殑鏁版嵁鍊�
+ var _receipt = receipt.Clone();
+ AddCommitAction("Receipt", () =>
+ {
+ //浣跨敤缁熶竴鐨勪簨鍔B瀵硅薄
+ var db = GetCommitDB();
+ //鏁版嵁淇濆瓨閫昏緫
+ db.Storageable(receipt, UserCode).ExecuteCommand();
+ db.Storageable(receiptDtl, UserCode).ExecuteCommand();
+ db.Storageable(receiptSn, UserCode).ExecuteCommand();
+ });
+
//瀹屾垚鎵�鏈夊鐞嗗悗浣跨敤浜嬪姟淇濆瓨鏁版嵁
action = DoIfFinish(action, input.Locale);
}
diff --git a/Tiger.IBusiness.WMS/Transaction/IIn_BIZ_U9_ASN.cs b/Tiger.IBusiness.WMS/Transaction/IIn_BIZ_U9_RECEIPT.cs
similarity index 75%
rename from Tiger.IBusiness.WMS/Transaction/IIn_BIZ_U9_ASN.cs
rename to Tiger.IBusiness.WMS/Transaction/IIn_BIZ_U9_RECEIPT.cs
index 67a229f..88c286e 100644
--- a/Tiger.IBusiness.WMS/Transaction/IIn_BIZ_U9_ASN.cs
+++ b/Tiger.IBusiness.WMS/Transaction/IIn_BIZ_U9_RECEIPT.cs
@@ -11,9 +11,9 @@
/// <summary>
/// 閫佽揣鍗�(U9)涓婃灦浜嬪姟
/// </summary>
- public interface IIn_BIZ_U9_ASN : IWmsTask
+ public interface IIn_BIZ_U9_RECEIPT : IWmsTask
{
- public IIn_BIZ_U9_ASN Init(string id, string userCode, string apiHost, string orgCode);
+ public IIn_BIZ_U9_RECEIPT Init(string id, string userCode, string apiHost, string orgCode);
/// <summary>
/// 鎵弿鍏ュ彛
diff --git a/Tiger.Model.Net/Entitys/WMS/BIZ_U9_RECEIPT_DTL.cs b/Tiger.Model.Net/Entitys/WMS/BIZ_U9_RECEIPT_DTL.cs
index d625302..99b76a7 100644
--- a/Tiger.Model.Net/Entitys/WMS/BIZ_U9_RECEIPT_DTL.cs
+++ b/Tiger.Model.Net/Entitys/WMS/BIZ_U9_RECEIPT_DTL.cs
@@ -78,10 +78,15 @@
/// </summary>
[DisplayName("鎶ュ簾鏁伴噺")]
public double QTY_SCRAP { get; set; }
- /// <summary>
- /// 鎵规鍙�
- /// </summary>
- [DisplayName("鎵规鍙�")]
+ /// <summary>
+ /// 璧犲搧鏁伴噺
+ /// </summary>
+ [DisplayName("璧犲搧鏁伴噺")]
+ public double QTY_GIFT { get; set; }
+ /// <summary>
+ /// 鎵规鍙�
+ /// </summary>
+ [DisplayName("鎵规鍙�")]
public string LOTNO { get; set; }
/// <summary>
/// 閫佽揣鍗旾D
--
Gitblit v1.9.3