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/ReprintLabel.cs | 299 +++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 276 insertions(+), 23 deletions(-)
diff --git a/Tiger.Business.WMS/Transaction/ReprintLabel.cs b/Tiger.Business.WMS/Transaction/ReprintLabel.cs
index b47277a..143253e 100644
--- a/Tiger.Business.WMS/Transaction/ReprintLabel.cs
+++ b/Tiger.Business.WMS/Transaction/ReprintLabel.cs
@@ -1,5 +1,4 @@
锘縰sing Rhea.Common;
-using Tiger.Model.Minsun;
using Microsoft.AspNetCore.Http;
using SqlSugar;
using System;
@@ -14,6 +13,9 @@
using System.Drawing.Drawing2D;
using Tiger.Model.Sharetronic.Shelf;
using Tiger.IBusiness;
+using Tiger.Model.MES.Yada;
+using Apache.NMS.ActiveMQ.Commands;
+using System.Diagnostics;
namespace Tiger.Business.WMS.Transaction
{
@@ -36,23 +38,10 @@
public string UserCode { get; set; }
public long UserId { get; set; }
public string OrgCode { get; set; }
- public List<SuggestItem> Suggests { get; set; } = new();
+ public string LocationCode { get; set; }
public List<V_WMS_ITEM> Vitem { get; set; } = new();
- public List<WMS_ITEM_POOL> CurPoolList => Suggests.Where(q => !q.poolItem.IsNullOrEmpty()).Select(q => q.poolItem).ToList();
- public Inventory CurInv { get; set; }
- public BIZ_ERP_PROD_OUT req { get; set; }
- public ReqType CurReqType { get; set; }
- public List<BIZ_ERP_PROD_OUT_DTL> dtls { get; set; } = new();
- public bool isExceed { get; set; }
- public ProductionPickToMes toMes { get; set; }
- public bool his_isComplete { get; set; }
- public bool isCutting { get; set; }
- public decimal cutQty { get; set; }
+ public ScanShelfInfo CurScanShelf { get; set; }
- public BIZ_WMS_TRANSFER transferH = null;
- public BIZ_WMS_TRANSFER cTransferH = null;
- public BIZ_WMS_TRANSFER_DTL transferDtl = null;
- public BIZ_WMS_TRANSFER_SN transferSn = null;
#endregion
#region Functions
@@ -61,7 +50,7 @@
/// </summary>
public async Task<ApiAction<ScanOutput>> Scan(BaseInput input)
{
- var action = new ApiAction<ScanOutput>();
+ var action = new ApiAction<ScanOutput>(new ScanOutput());
try
{
if (input.SN.IsNullOrEmpty())
@@ -70,21 +59,285 @@
action.LocaleMsg = Biz.L("WMS.RePrint.ScanItem.SnEmptyFailure");
return SetOutPutMqttMsg(action, input.Locale);
}
-
+ var LotNos = Biz.DataSource["YadaU9C"].Client.Ado.SqlQuery<mes_WhLotCodeQtyInfo>($"select *,'' as ID from mes_WhLotCodeQtyInfo where Bin = '{input.SN}'");
+ //Biz.DataSource["YadaU9C"].Client.Queryable<mes_WhLotCodeQtyInfo>().Where(t => t.Bin == input.SN).ToList();
+ CurScanShelf = new ScanShelfInfo();
+ // 鏌ヨ璐ф灦淇℃伅
var whUnit = await Biz.Db.Queryable<V_WH_UNIT>().Where(t => (t.SHELF_CODE.ToUpper() == input.SN || t.LOCATION_CODE.ToUpper() == input.SN) && t.AUTH_ORG == OrgCode).IncludesAllFirstLayer().FirstAsync();
-
-
+ if (!whUnit.IsNullOrEmpty() && whUnit.LOCATION_CODE == input.SN)
+ {
+ if (whUnit.IS_ACTIVE == "N")
+ {
+ action.IsSuccessed = false;
+ //action.LocaleMsg = Biz.L("鎵弿鐨勫偍浣峓{0}]鏈惎鐢�");
+ action.LocaleMsg = Biz.L("WMS.Default.ScanShelf.ShelfOrLocationDisabled", input.SN);
+ return action;
+ }
+ if (whUnit.Shelf.IsLightShelf || whUnit.Location.IS_SINGLE == "Y")
+ {
+ var locationData = Biz.Db.Queryable<WMS_ITEM>().Where(q => q.LOCATION_ID == whUnit.LOCATION_ID && q.AUTH_ORG == OrgCode).First();
+ if (!locationData.IsNullOrEmpty())
+ {
+ action.IsSuccessed = false;
+ //action.LocaleMsg = Biz.L("鍌ㄤ綅[{0}]宸插瓨鏈夌墿鏂橻{1}]锛岃妫�鏌ョ郴缁熷簱瀛樹俊鎭�");
+ action.LocaleMsg = Biz.L($"WMS.Default.ScanShelf.ItemAlreadyExistsInLocation", input.SN, locationData.SN);
+ return action;
+ }
+ }
+ CurScanShelf.Shelf = whUnit.Shelf;
+ CurScanShelf.Location = whUnit.Location;
+ CurScanShelf.WarehouseCode = whUnit.WH_CODE;
+ CurScanShelf.RegionCode = whUnit.REGION_CODE;
+ CurScanShelf.ShelfCode = whUnit.SHELF_CODE;
+ CurScanShelf.LocationCode = whUnit.LOCATION_CODE;
+ CurScanShelf.IsSmartRack = false;
+ LocationCode = whUnit.LOCATION_CODE;
+ }
+ else {
+ action.IsSuccessed = false;
+ //action.LocaleMsg = Biz.L("璇疯緭鍏ユ垨鎵弿鏈夋晥鐨勮揣鏋�/鍌ㄤ綅鐮�");
+ action.LocaleMsg = Biz.L("WMS.Default.ScanShelf.ShelfCanNotEmpty");
+ return action;
+ }
+ var temps = new List<TemplateInput>();
+ foreach (var item in LotNos)
+ {
+ var temp = new TemplateInput
+ {
+ custCode="",
+ itemCode= item.ItemCode,
+ itemDesc= item.Description,
+ sapItemCode= item.SapCode,
+ WoBatch = item.LotCode,
+ batchQty= item.StoreQty,
+ qrCode="",
+ };
+ temps.Add(temp);
+ }
+
+ var y = Biz.Db.Storageable(LotNos, UserCode)
+ .WhereColumns(t => new { t.ItemCode, t.LotCode })
+ .ToStorage();
+ y.AsInsertable.ExecuteCommand();
+ y.AsUpdateable.IgnoreColumns(x => x.ID).ExecuteCommand();
+ action.Data.Data = temps;
+ action.LocaleMsg = Biz.L("WMS.RePrint.ScanItem.ScanSuccessed");
}
catch (Exception ex)
{
- //鍙栨秷褰撳墠鎿嶄綔
- ResetInfo();
//action.CatchExceptionWithLog(ex, $"鎵弿[{input.SN}]寮傚父");
- action.CatchExceptionWithLog(ex, Biz.L("WMS.Default.Scan.ScanException", input.SN));
+ action.CatchExceptionWithLog(ex, Biz.L("WMS.RePrint.Scan.ScanException", input.SN));
}
return SetOutPutMqttMsg(action, input.Locale);
}
+ public async Task<ApiAction<ScanOutput>> ScanItem(BaseInput input)
+ {
+ var action = new ApiAction<ScanOutput>(new ScanOutput());
+ try
+ {
+ List<WMS_ITEM> items = new List<WMS_ITEM>();
+ List<WMS_ITEM_HIS> itemhiss = new List<WMS_ITEM_HIS>();
+ List<WMS_ITEM_PKG> itemPkgs = new List<WMS_ITEM_PKG>();
+ List<WMS_ITEM_EXT> itemExts = new List<WMS_ITEM_EXT>();
+ var rePrints = (input.Data ?? "").JsonToObject<RePrintLabelBase>() ?? new RePrintLabelBase();
+ if (!rePrints.SnList.Any() || rePrints.SnList.Any(q => q.Qty <= 0))
+ {
+ action.IsSuccessed = false;
+ //action.LocaleMsg = Biz.L("鏁伴噺涓嶈兘灏忎簬绛変簬闆讹紝璇烽噸鏂扮‘璁ゆ潯鐮乕{0}]鐨勬暟閲�");
+ action.LocaleMsg = Biz.L("WMS.Default.ScanItem.ReComfirmQty", input.SN);
+ return action;
+ }
+ else
+ {
+ //if (Biz.Db.Queryable<WMS_ITEM>().Any(q=>q.SUPP_LOTNO == rePrints.BatchNo) && (Biz.Db.Queryable<WMS_ITEM>().Where(q=>q.SUPP_LOTNO == rePrints.BatchNo && q.STATUS == WMS_ITEM.STATUSs.InStore.GetValue()).Sum(x=>x.QTY)>= rePrints.BatchQty)) {
+ // action.IsSuccessed = false;
+ // action.LocaleMsg = Biz.L($"姝ゅ簱浣峓{LocationCode}]涓婄殑鎵规[{rePrints.BatchNo}]鏁伴噺宸茬粡澶熸暟锛屼笉鑳藉啀涓婃灦鐢熸垚鏍囩");
+ // return action;
+ //}
+ foreach (var ent in rePrints.SnList)
+ {
+ string CurSN = DI.Resolve<ICodeRuleCache>()["InitialBarcode"]?.Generate($"{ent.SN}").Data.ToString() ?? "";
+ ent.SN = CurSN;
+
+ //瑙ｆ瀽鏉＄爜
+ Result<IInventory> result = WMS_ITEM_Biz.WmsItem.Get(CurSN, input.AuthOption, true);
+ if (!result.IsSuccessed)
+ {
+ action.IsSuccessed = false;
+ action.LocaleMsg = result.LocaleMsg;
+ return action;
+ }
+ var inv = result.Data as Inventory;
+
+ //楠岃瘉鏉＄爜鏄惁姝ｇ‘
+ if (new[] { WMS_ITEM.STATUSs.InStore, WMS_ITEM.STATUSs.Loaded, WMS_ITEM.STATUSs.UseUp }.Contains(inv.Status))
+ {
+ action.IsSuccessed = false;
+ //action.LocaleMsg = Biz.L("鐘舵�乕{0}]寮傚父锛岃閲嶆柊鎵弿");
+ action.LocaleMsg = Biz.L("WMS.Default.ScanItem.StatusException", string.Join(',', inv.StatusList.Select(q => q.GetDesc())));
+ return action;
+ }
+ //鐗╂枡楠岃瘉
+ if (inv.ItemInfo.IsNullOrEmpty() || inv.ItemInfo.IS_ACTIVE == "N")
+ {
+ action.IsSuccessed = false;
+ //action.LocaleMsg = Biz.L("鐗╂枡缂栫爜[{0}]涓嶅瓨鍦ㄦ垨鑰呰鐗╂枡鏈惎鐢�");
+ 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;
+ }
+ }
+
+ //鏇存柊宸茬‘璁ょ墿鏂欐暟閲�
+ var _item = inv.Items.First(q => q.SN == CurSN);
+ _item.QTY = ent.Qty;
+ var pkg = inv.Packages.First(q => q.SN == CurSN);
+ pkg.QTY = ent.Qty;
+ inv.UpdatePkgQty();
+
+ var nLocation = new WMS_LOCATION();
+
+ if (CurScanShelf.LocationCode.IsNullOrEmpty() || CurScanShelf.WarehouseCode.IsNullOrEmpty())
+ {
+ action.IsSuccessed = false;
+ //action.LocaleMsg = Biz.L("璇疯緭鍏ユ垨鎵弿鏈夋晥鐨勮揣鏋�/鍌ㄤ綅鐮�");
+ action.LocaleMsg = Biz.L("WMS.Default.ScanShelf.ShelfCanNotEmpty");
+ return action;
+ }
+
+ nLocation = await Biz.Db.Queryable<WMS_LOCATION>().Where(t => t.LOCATION_CODE == CurScanShelf.LocationCode && t.AUTH_ORG == OrgCode).FirstAsync();
+
+ //鍒ゆ柇鍌ㄤ綅鏄惁鍗曟斁
+ //if (nLocation.IS_SINGLE == "Y" && inv.Items.Count > 1)
+ //{
+ // action.IsSuccessed = false;
+ // //action.LocaleMsg = Biz.L("鍌ㄤ綅[{0}]鍙兘瀛樻斁涓�涓墿鏂�");
+ // action.LocaleMsg = Biz.L("WMS.Default.ScanItem.LocationSingleFailure", nLocation.LOCATION_CODE);
+ // CurInvItem = null;
+ // CurSN = "";
+ // return action;
+ //}
+
+ //鎵ц涓婃灦
+ //foreach (var item in inv.Items)
+ //{
+ // item.TRANS_CODE = "ReprintLabel";
+ // item.TRANS_NO = $"ReprintLabel{DateTime.Now:yyyyMMdd}";
+ //}
+ //Result<PutOnInfo> putonResult = WMS_ITEM_Biz.WmsItem.PutOn(inv, input.AuthOption, nLocation.LOCATION_CODE);
+ //if (!putonResult.IsSuccessed)
+ //{
+ // action.IsSuccessed = false;
+ // action.LocaleMsg = putonResult.LocaleMsg;
+ // inv = null;
+ // CurSN = "";
+ // return action;
+ //}
+ //PutOnInfo putOnInfo = putonResult.Data;
+ //items.AddRange(putOnInfo.Items);
+ //itemhiss.AddRange(putOnInfo.History);
+ //itemPkgs.AddRange(putOnInfo.Packages);
+ //itemExts.AddRange(putOnInfo.ItemsExt);
+ }
+ //淇濆瓨鍒版暟鎹簱
+ //var db = Business.Biz.Db;
+ //var dbTran = db.UseTran(() =>
+ //{
+ // //鍏ュ簱
+ // db.Storageable(items, UserCode).ExecuteCommand();
+ // db.Storageable(itemPkgs, UserCode).ExecuteCommand();
+ // db.Insertable(itemhiss, UserCode).ExecuteCommand();
+ // var x = db.Storageable(itemExts, UserCode).ToStorage();
+ // x.AsInsertable.ExecuteCommand();//涓嶅瓨鍦ㄦ彃鍏�
+ // x.AsUpdateable.ExecuteCommand();//瀛樺湪鏇存柊
+ //});
+ //if (!dbTran.IsSuccess)
+ //{
+ // Logger.Default.Fatal(dbTran.ErrorException, "Database transaction save exception");
+ // throw dbTran.ErrorException;
+ //}
+
+ action.Data.Data = rePrints;
+ action.LocaleMsg = Biz.L("搴撲綅鎵规鏉＄爜涓婃灦鎴愬姛");
+ }
+ }
+ catch (Exception ex)
+ {
+ action.CatchExceptionWithLog(ex, Biz.L("搴撲綅鎵规鏉＄爜涓婃灦澶辫触"));
+ }
+ return action;
+ }
+
#endregion
public override bool Close(bool needSaveHistoryLog = false)
--
Gitblit v1.9.3