From 59767bdf5a8aa4e3e2250263f262aa4a599d6c7a Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期一, 24 三月 2025 15:49:00 +0800
Subject: [PATCH] 来料打印清点
---
Tiger.Business.WMS/Transaction/Yada/Print_BIZ_U9_ASN.cs | 734 +++++++++++++++++++++++++++++++++----------------------
1 files changed, 440 insertions(+), 294 deletions(-)
diff --git a/Tiger.Business.WMS/Transaction/Yada/Print_BIZ_U9_ASN.cs b/Tiger.Business.WMS/Transaction/Yada/Print_BIZ_U9_ASN.cs
index 16a7aae..0c0ad4a 100644
--- a/Tiger.Business.WMS/Transaction/Yada/Print_BIZ_U9_ASN.cs
+++ b/Tiger.Business.WMS/Transaction/Yada/Print_BIZ_U9_ASN.cs
@@ -9,30 +9,42 @@
using System.Threading.Tasks;
using Tiger.Model;
using Tiger.IBusiness;
-using Tiger.Model.Sharetronic.Shelf;
-using Tiger.Business.WMS.Sharetronic.Shelf;
+using Tiger.Model.MES.Yada;
using Tiger.Model.Entitys.MES.U9C;
+using System.Security.Policy;
using Tiger.Model.Entitys.MES.Position;
namespace Tiger.Business.WMS.Transaction
{
/// <summary>
- /// (U9)鏉ユ枡鎵撳嵃涓婃灦浜嬪姟
+ /// (U9)鏉ユ枡鎵撳嵃娓呯偣浜嬪姟
/// </summary>
public class Print_BIZ_U9_ASN : WmsTask, IPrint_BIZ_U9_ASN
{
public IPrint_BIZ_U9_ASN Init(string id, string userCode, string apiHost, string orgCode)
{
base.Init(id, userCode, apiHost, orgCode);
+ //鍔犺浇宸茬粡娓呯偣鏁版嵁
+ LoadData();
Logger.Console.Info($"Start {this.GetType().Name} Transaction[ID: {TransID}]");
return this;
}
#region Propertys & Variables
-
+ //private List<WmsOrder<BIZ_U9_ASN>> _OrderList { get; set; } = new();
+ private List<string> OrderList = new();
+ private List<BIZ_U9_ASN_SN> CurSn = new();
+ private List<BIZ_U9_ASN_SN> ScanList = new();
#endregion
#region Functions
+ /// <summary>
+ /// 鍒濆鍖栨竻鐐规暟鎹�
+ /// </summary>
+ private void LoadData()
+ {
+ OrderList = MainDB.Queryable<BIZ_U9_ASN_SN>().Where(q => q.RECEIVER == UserCode && SqlFunc.Subqueryable<BIZ_U9_ASN>().Where(s => s.ORDER_NO == q.ORDER_NO && s.STATUS == BIZ_U9_ASN.STATUSs.Counting.GetValue()).Any()).Select(q => q.ORDER_NO).ToList();
+ }
/// <summary>
/// 鎵弿鍏ュ彛
/// </summary>
@@ -48,14 +60,8 @@
action.LocaleMsg = Biz.L("WMS.Default.ScanItem.SnEmptyFailure");
return SetOutPutMqttMsg(action, input.Locale);
}
- //鍒ゆ柇鎵弿鐨勬槸鍚﹁揣鏋�
- var whUnit = await MainDB.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 (string.IsNullOrEmpty(CurScanShelf?.ShelfCode))
- if (!whUnit.IsNullOrEmpty() || string.IsNullOrEmpty(CurScanShelf?.ShelfCode))
- {
- action = await ScanShelf(input.SN, whUnit);
- }
- else//鎵弿鐗╂枡骞跺鏍�
+ //鎵弿鐗╂枡骞跺鏍�
+ else //if (Command == "Normal")
{
action = await ScanItem(input);
}
@@ -71,201 +77,81 @@
}
/// <summary>
- /// 鎵弿鐗╂枡骞跺鏍革紝濡傛灉鐗╂枡宸茬粡瀹屾垚绉诲簱鍒欒揣鏋朵笂浜伅鎻愰啋鍌ㄤ綅
+ /// 鎵弿鐗╂枡骞跺鏍�
/// </summary>
public async Task<ApiAction<ScanOutput>> ScanItem(BaseInput input)
{
var action = new ApiAction<ScanOutput>(new ScanOutput() { Command = Command });
try
{
- if (CurInvItem.IsNullOrEmpty())
+ //瑙ｆ瀽鏉＄爜
+ Barcode barcode = new Barcode(input.SN);
+ if (barcode.IsException)
{
- //瑙ｆ瀽鏉＄爜
- Result<IInventory> result = WMS_ITEM_Biz.WmsItem.Get(input.SN, input.AuthOption, true);
- if (!result.IsSuccessed)
- {
- action.IsSuccessed = false;
- action.LocaleMsg = result.LocaleMsg;
- return SetOutPutMqttMsg(action, input.Locale);
- }
- var inv = result.Data as Inventory;
-
- //楠岃瘉鏉＄爜鏄惁姝ｇ‘
- if (!inv.isNormalStatus || inv.Status != WMS_ITEM.STATUSs.WaitIn)
- {
- 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 SetOutPutMqttMsg(action, input.Locale);
- }
- //鐗╂枡楠岃瘉
- 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 SetOutPutMqttMsg(action, input.Locale);
- }
- CurInvItem = inv;
+ throw barcode.AnalyseException;
}
-
- var receipt = await Biz.Db.Queryable<BIZ_U9_RECEIPT>().Where(q => q.ORDER_NO == CurInvItem.Items.First().TRANS_NO).IncludesAllFirstLayer().FirstAsync();
- if (receipt.IsNullOrEmpty())
+ //闈炴硶鏉＄爜
+ else if (!barcode.IsRegular)
{
action.IsSuccessed = false;
- //action.LocaleMsg = Biz.L("鏀惰揣鍗曚腑鎵句笉鍒版潯鐮佹墍灞炵殑鍗曟嵁[{0}]淇℃伅锛岃閲嶆柊鎵弿鏀惰揣鍗曠殑鏉＄爜鎴栭�夋嫨姝ｇ‘鐨勫姛鑳戒笂鏋�");
- action.LocaleMsg = Biz.L("WMS.Print_BIZ_U9_ASN.ScanItem.ReceiptNotExists", CurInvItem.Items.First().TRANS_NO);
- return SetOutPutMqttMsg(action, input.Locale);
- }
- 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.Print_BIZ_U9_ASN.ScanItem.ReceiptDtlStatusException", receiptDtl.LINE_NO, receiptDtl.STATUS.GetEnumDesc<BIZ_U9_RECEIPT.STATUSs>());
- return SetOutPutMqttMsg(action, input.Locale);
- }
- var receiptSn = receipt.SnList.Where(q => CurInvItem.Items.Any(i => i.SN == q.SN)).ToList();
- if (receiptSn.Any(q => q.STATUS != WMS_ITEM.STATUSs.WaitIn.GetValue()))
- {
- action.IsSuccessed = false;
- //action.LocaleMsg = Biz.L("鏀惰揣鍗曚腑鏉＄爜[{0}]鐘舵�乕{1}]寮傚父锛岃鎵弿姝ｇ‘鐨勬潯鐮�");
- action.LocaleMsg = Biz.L("WMS.Print_BIZ_U9_ASN.ScanItem.ReceiptSnStatusException", CurInvItem.SN, receiptSn.First(q => q.STATUS != WMS_ITEM.STATUSs.WaitIn.GetValue()).STATUS.GetEnumDesc<WMS_ITEM.STATUSs>());
- return SetOutPutMqttMsg(action, input.Locale);
+ //action.LocaleMsg = Biz.L("鏉＄爜涓洪潪娉曟潯鐮�");
+ action.LocaleMsg = Biz.L("WMS.WmsItem.Barcode.IllegalFailure", input.SN);
+ return SetOutPutMqttMsg(action, input.Locale); ;
}
- var nLocation = new WMS_LOCATION();
- // 鍒ゆ柇鏄惁鏅鸿兘璐ф灦
- if (CurScanShelf.Shelf.IsLightShelf)
+ if (barcode.Type == Barcode.Types.OuterPackage)
{
- ShelfApiResult shelfApiResult = await Share.Shelf.PutOn(TransID, CurScanShelf.Shelf, CurInvItem.Items[0]);
- if (!shelfApiResult.IsSuccess)
- {
- action.IsSuccessed = false;
- action.LocaleMsg = Biz.L(shelfApiResult.GetData<string>());
- return SetOutPutMqttMsg(action, input.Locale);
- }
- var reaultShelf = shelfApiResult.GetData<ShelfChangeModel>();
-
- nLocation = reaultShelf.GetLocation();
- if (nLocation == null)
- {
- action.IsSuccessed = false;
- //action.LocaleMsg = Biz.L($"璐ф灦[{0}]涓笉瀛樺湪id涓篬{1}]鐨勫偍浣嶏紝璇峰厛缁存姢璐ф灦淇℃伅");
- action.LocaleMsg = Biz.L("WMS.Default.ScanItem.LocationNotExistsInShelf", CurScanShelf.Shelf.SHELF_CODE, reaultShelf.ledAddr);
- return SetOutPutMqttMsg(action, input.Locale);
- }
- var locationData = MainDB.Queryable<WMS_ITEM>().Where(q => q.LOCATION_ID == nLocation.ID).First();
- if (!locationData.IsNullOrEmpty())
- {
- action.IsSuccessed = false;
- //action.LocaleMsg = Biz.L("鍌ㄤ綅[{0}]宸插瓨鏈夌墿鏂橻{1}]锛岃妫�鏌ョ郴缁熷簱瀛樹俊鎭�");
- action.LocaleMsg = Biz.L($"WMS.Default.ScanShelf.ItemAlreadyExistsInLocation", nLocation.LOCATION_CODE, locationData.SN);
- return SetOutPutMqttMsg(action, input.Locale);
- }
- CurScanShelf.LocationCode = nLocation.LOCATION_CODE;
+ CurSn = MainDB.Queryable<BIZ_U9_ASN_SN>().Where(q => q.CARTON_NO == barcode.SN).ToList();
}
else
{
- if (CurScanShelf.LocationCode.IsNullOrEmpty() || CurScanShelf.WarehouseCode.IsNullOrEmpty())
+ CurSn = MainDB.Queryable<BIZ_U9_ASN_SN>().Where(q => q.SN == barcode.SN).ToList();
+ foreach (var sn in CurSn)
{
- action.IsSuccessed = false;
- //action.LocaleMsg = Biz.L("璇疯緭鍏ユ垨鎵弿鏈夋晥鐨勮揣鏋�/鍌ㄤ綅鐮�");
- action.LocaleMsg = Biz.L("WMS.Default.ScanShelf.ShelfCanNotEmpty");
- return SetOutPutMqttMsg(action, input.Locale);
- }
-
- nLocation = await MainDB.Queryable<WMS_LOCATION>().Where(t => t.LOCATION_CODE == CurScanShelf.LocationCode && t.AUTH_ORG == OrgCode).FirstAsync();
- }
-
- //鍒ゆ柇鍌ㄤ綅鏄惁鍗曟斁
- if (nLocation.IS_SINGLE == "Y" && CurInvItem.Items.Count > 1)
- {
- action.IsSuccessed = false;
- //action.LocaleMsg = Biz.L("鍌ㄤ綅[{0}]鍙兘瀛樻斁涓�涓墿鏂�");
- action.LocaleMsg = Biz.L("WMS.Default.ScanItem.LocationSingleFailure", nLocation.LOCATION_CODE);
- ResetScan();
- return SetOutPutMqttMsg(action, input.Locale);
- }
-
- //鎵ц涓婃灦鏁版嵁澶勭悊
- foreach (var item in CurInvItem.Items)
- {
- item.IS_LOCKED = "Y";
- 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;
- item.PROD_DATE = item.PROD_DATE < new DateTime(2000, 1, 1) ? DateTime.Now : item.PROD_DATE;
- item.FIRST_IN_DATE = item.FIRST_IN_DATE < new DateTime(2000, 1, 1) ? DateTime.Now : item.FIRST_IN_DATE;
- }
- Result putonResult = PutOn(input.AuthOption, nLocation.LOCATION_CODE);
- if (!putonResult.IsSuccessed)
- {
- action.IsSuccessed = false;
- action.LocaleMsg = putonResult.LocaleMsg;
- ResetScan();
- return SetOutPutMqttMsg(action, input.Locale);
- }
-
- //鏇存柊鍗曟嵁淇℃伅
- foreach(var sn in receiptSn)
- {
- sn.STATUS = WMS_ITEM.STATUSs.InStore.GetValue();
- sn.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();
- //褰撳墠鍗曟嵁鏄庣粏宸茬粡鍏ㄩ儴涓婃灦瀹屾垚锛屽彲浠ヨ皟鐢║9琛屽鎺ュ彛
- var iInput = new SubmitLineInput
- {
- userId = UserCode,
- IsLogin = true,
- param = new()
- {
- RcvLineID = receiptDtl.ID,
- RcvDocNo = receiptDtl.ORDER_NO,
- DocLineNo = receiptDtl.LINE_NO,
- OrgCode = receiptDtl.AUTH_ORG,
- }
- };
- var result = await DI.Resolve<IWMS_U9C>().ReceivementApproveLine(iInput);
- if (!result.IsSuccessed)
- {
- action.IsSuccessed = false;
- action.LocaleMsg = result.LocaleMsg;
- return SetOutPutMqttMsg(action, input.Locale);
+ sn.META_SN = input.SN;
}
}
- else
+
+ if (CurSn.IsNullOrEmpty())
{
- receiptDtl.STATUS = BIZ_U9_RECEIPT.STATUSs.Storing.GetValue();
+ action.IsSuccessed = false;
+ //action.LocaleMsg = Biz.L("ASN鍗曚腑涓嶅瓨鍦ㄦ潯鐮乕{0}]");
+ action.LocaleMsg = Biz.L("WMS.Print_BIZ_U9_ASN.SnNotExists", input.SN);
+ return SetOutPutMqttMsg(action, input.Locale); ;
}
- var dtlStatus = receipt.Details.Select(q => q.STATUS).Distinct();
- if (dtlStatus.Count() == 1 && dtlStatus.First() == BIZ_U9_RECEIPT.STATUSs.Review.GetValue())
+ if (CurSn.First().AUTH_ORG != input.AuthOption.CurOrg)
{
- receipt.STATUS = BIZ_U9_RECEIPT.STATUSs.Review.GetValue();
+ action.IsSuccessed = false;
+ //action.LocaleMsg = Biz.L($"鏉＄爜鎵�灞炵粍缁嘯{0}]涓庡綋鍓嶇櫥褰曠粍缁嘯{1}]涓嶄竴鑷达紝璇烽噸鏂伴�夋嫨缁勭粐");
+ action.LocaleMsg = Biz.L("WMS.Print_BIZ_U9_ASN.OrgNotCorrect", CurSn.First().AUTH_ORG, input.AuthOption.CurOrg);
+ return SetOutPutMqttMsg(action, input.Locale); ;
}
- else
+ //楠岃瘉鏉＄爜鏄惁姝ｇ‘
+ if (CurSn.First().STATUS > WMS_ITEM.STATUSs.Incoming.GetValue())
{
- receipt.STATUS = BIZ_U9_RECEIPT.STATUSs.Storing.GetValue();
+ action.IsSuccessed = false;
+ //action.LocaleMsg = Biz.L("鐘舵�乕{0}]寮傚父锛岃閲嶆柊鎵弿");
+ action.LocaleMsg = Biz.L("WMS.Default.ScanItem.StatusException", CurSn.First().STATUS.GetEnumDesc<WMS_ITEM.STATUSs>());
+ return SetOutPutMqttMsg(action, input.Locale); ;
+ }
+
+ //鎵ц娓呯偣鏁版嵁澶勭悊
+ foreach (var sn in CurSn)
+ {
+ sn.STATUS = WMS_ITEM.STATUSs.Counted.GetValue();
+ sn.RECEIVER = UserCode;
+ sn.RECEIVE_DATE = DateTime.Now;
}
//鍒涘缓鍙橀噺鍏嬮殕瀵硅薄鐢ㄤ簬浼犲叆DBSubmitAction涓繚瀛樺綋鍓嶉渶瑕佹殏瀛樼殑鏁版嵁鍊�
- var _receipt = receipt.Clone();
- AddCommitAction("Receipt", () =>
+ var _CurSn = CurSn.Clone();
+ AddCommitAction("Counted", () =>
{
//浣跨敤缁熶竴鐨勪簨鍔B瀵硅薄
var db = GetCommitDB();
//鏁版嵁淇濆瓨閫昏緫
- db.Updateable(receipt, UserCode).UpdateColumns(q => new { q.STATUS, q.UPDATE_TIME, q.UPDATE_USER }).ExecuteCommand();
- db.Updateable(receiptDtl, UserCode).UpdateColumns(q => new { q.STATUS, q.QTY_IN, q.UPDATE_TIME, q.UPDATE_USER }).ExecuteCommand();
- db.Updateable(receiptSn, UserCode).UpdateColumns(q => new { q.STATUS, q.IS_IN, q.UPDATE_TIME, q.UPDATE_USER }).ExecuteCommand();
+ db.Updateable<BIZ_U9_ASN>(UserCode).SetColumns(q => q.STATUS == BIZ_U9_ASN.STATUSs.Counting.GetValue()).Where(q => q.ORDER_NO == _CurSn.First().ORDER_NO).ExecuteCommand();
+ db.Storageable(_CurSn, UserCode).ExecuteCommand();
});
//瀹屾垚鎵�鏈夊鐞嗗悗浣跨敤浜嬪姟淇濆瓨鏁版嵁
@@ -275,101 +161,10 @@
{
//鍙栨秷褰撳墠鎿嶄綔
ResetScan();
- //action.CatchExceptionWithLog(ex, $"鎵弿鏉＄爜[{input.SN}]澶嶆牳寮傚父");
+ //action.CatchExceptionWithLog(ex, $"鎵弿鏉＄爜[{0}]澶嶆牳寮傚父");
action.CatchExceptionWithLog(ex, Biz.L("WMS.Default.ScanItem.ScanException", input.SN));
}
return SetOutPutMqttMsg(action, input.Locale);
- }
-
- /// <summary>
- /// 鎵弿璐ф灦鎴栬�呭偍浣�
- /// </summary>
- public async Task<ApiAction<ScanOutput>> ScanShelf(string Code, V_WH_UNIT whUnit)
- {
- var action = new ApiAction<ScanOutput>(new ScanOutput() { Command = Command });
- try
- {
- if (Code.IsNullOrEmpty())
- {
- action.IsSuccessed = false;
- //action.LocaleMsg = Biz.L("璇疯緭鍏ユ垨鎵弿鏈夋晥鐨勮揣鏋�/鍌ㄤ綅鐮�");
- action.LocaleMsg = Biz.L("WMS.Default.ScanShelf.ShelfCanNotEmpty");
- return action;
- }
-
- CurScanShelf = new ScanShelfInfo();
-
- // 鏌ヨ璐ф灦淇℃伅
- whUnit = whUnit.IsNullOrEmpty(await MainDB.Queryable<V_WH_UNIT>().Where(t => (t.SHELF_CODE.ToUpper() == Code || t.LOCATION_CODE.ToUpper() == Code) && t.AUTH_ORG == OrgCode).IncludesAllFirstLayer().FirstAsync());
-
- // 鎵弿璐ф灦浠ｇ爜锛屼笖涓烘櫤鑳借揣鏋�
- if (!whUnit.IsNullOrEmpty() && whUnit.SHELF_CODE == Code)
- {
- CurScanShelf.Shelf = whUnit.Shelf;
- CurScanShelf.WarehouseCode = whUnit.WH_CODE;
- CurScanShelf.RegionCode = whUnit.REGION_CODE;
- CurScanShelf.ShelfCode = whUnit.SHELF_CODE;
- CurScanShelf.ShelfType = whUnit.SHELF_TYPE;
- CurScanShelf.IsSmartRack = true;
- }
- // 鎵弿搴撲綅浠ｇ爜
- else if (!whUnit.IsNullOrEmpty() && whUnit.LOCATION_CODE == Code)
- {
- //var nLocation = await MainDB.Queryable<V_WH_UNIT>().Where(t => t.LOCATION_CODE.ToUpper() == Code.ToUpper() && t.AUTH_ORG == OrgCode).IncludesAllFirstLayer().FirstAsync();
- //if (nLocation == null)
- //{
- // action.IsSuccessed = false;
- // //action.LocaleMsg = Biz.L("鍌ㄤ綅[{0}]涓嶅瓨鍦�");
- // action.LocaleMsg = Biz.L("WMS.Default.ScanShelf.LocationNotExist", Code);
- // return action;
- //}
- if (whUnit.IS_ACTIVE == "N")
- {
- action.IsSuccessed = false;
- //action.LocaleMsg = Biz.L("鎵弿鐨勫偍浣峓{0}]鏈惎鐢�");
- action.LocaleMsg = Biz.L("WMS.Default.ScanShelf.ShelfOrLocationDisabled", Code);
- return action;
- }
- if (whUnit.Shelf.IsLightShelf || whUnit.Location.IS_SINGLE == "Y")
- {
- var locationData = MainDB.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", Code, 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;
- }
- else
- {
- action.IsSuccessed = false;
- //action.LocaleMsg = Biz.L("璇疯緭鍏ユ垨鎵弿鏈夋晥鐨勮揣鏋�/鍌ㄤ綅鐮�");
- action.LocaleMsg = Biz.L("WMS.Default.ScanShelf.ShelfCanNotEmpty");
- return action;
- }
-
- CurScanShelf.IsScanShelf = true;
- //action.LocaleMsg = Biz.L("鎵弿璐ф灦/鍌ㄤ綅[{0}]鎴愬姛");
- action.LocaleMsg = Biz.L("WMS.Default.ScanShelf.ScanSucceeded", Code);
- action.Data.Data = CurScanShelf;
- }
- catch (Exception ex)
- {
- //鍙栨秷褰撳墠鎿嶄綔
- ResetScan();
- //action.CatchExceptionWithLog(ex, $"鎵弿璐ф灦/鍌ㄤ綅[{0}]寮傚父");
- action.CatchExceptionWithLog(ex, Biz.L("WMS.Default.ScanShelf.ScanException", Code));
- }
- return action;
}
/// <summary>
@@ -382,27 +177,385 @@
//淇濆瓨鏁版嵁搴�
SaveCommitListToDB();
- // 杩斿洖鏁版嵁
- action.Data.Data = new DefaultInStoreOutput
+ if (!OrderList.Contains(CurSn.First().ORDER_NO))
{
- Barcode = CurInvItem.SN,
- MaterialCode = CurInvItem.ItemInfo.ITEM_CODE,
- MaterialName = CurInvItem.ItemInfo.ITEM_NAME,
- CurrentQty = CurInvItem.Items[0].QTY,
- Unit = CurInvItem.Items[0].UNIT,
- DateCode = CurInvItem.Items[0].PROD_DATE,
- WarehouseCode = CurInvItem.Warehouse.WH_CODE,
- RegionCode = CurInvItem.Region.REGION_CODE,
- ShelfCode = CurInvItem.Shelf.SHELF_CODE,
- LocationCode = CurInvItem.Location.LOCATION_CODE,
- };
+ OrderList.Add(CurSn.First().ORDER_NO);
+ }
+ ScanList.AddRange(CurSn);
- //action.LocaleMsg = Biz.L($"鎵弿鏉＄爜[{0}]涓婃灦鍒板偍浣峓{1}]鎴愬姛");
- action.LocaleMsg = Biz.L("WMS.Default.ScanItem.PutOnSucceeded", CurInvItem.SN, CurInvItem.Location.LOCATION_CODE);
+ // 杩斿洖鏁版嵁
+ action.Data.Data = ScanList;
+
+ //action.LocaleMsg = Biz.L($"鏉＄爜[{0}]娓呯偣鎴愬姛锛�");
+ action.LocaleMsg = Biz.L("WMS.Print_BIZ_U9_ASN.CountSuccess", CurSn.First().SN);
//閲嶇疆宸ュ簭
- ResetScanInfo();
- return SetOutPutMqttMsg(action, locale);
+ ResetScan();
+ return SetOutPutMqttMsg(action, locale); ;
+ }
+
+ /// <summary>
+ /// 鍒犻櫎褰撳墠鎵�鏈夊凡娓呯偣璁板綍
+ /// </summary>
+ /// <returns></returns>
+ public async Task<ApiAction> DeleteScannedList()
+ {
+ var action = new ApiAction();
+ try
+ {
+ foreach (var sn in ScanList)
+ {
+ sn.STATUS = WMS_ITEM.STATUSs.Incoming.GetValue();
+ sn.RECEIVER = null;
+ sn.RECEIVE_DATE = DateTime.MinValue;
+ }
+
+ //var historys = new List<WMS_ITEM_HIS>();
+ //var items = await Biz.Db.Queryable<WMS_ITEM>().Where(q => ScanList.Select(s => s.SN).Contains(q.SN)).ToListAsync();
+ //foreach (var item in items)
+ //{
+ // var order = item.TRANS_CODE;
+ // item.STATUS = WMS_ITEM.STATUSs.Incoming.GetValue();
+ // item.SOURCE_CODE = "";
+ // item.SOURCE_ORDER = "";
+ // item.SOURCE_LINE = "";
+ // item.TRANS_CODE = item.SOURCE_CODE;
+ // item.TRANS_NO = item.SOURCE_ORDER;
+ // item.TRANS_LINE = item.SOURCE_LINE;
+ // historys.Add(new WMS_ITEM_HIS(item, $"鏉＄爜[{item.SN}]鍙栨秷娓呯偣锛屾搷浣滃崟鎹甗{order}]"));
+ //}
+
+ //浣跨敤缁熶竴鐨勪簨鍔B瀵硅薄
+ var db = GetCommitDB();
+ var dbTran = db.UseTran(() =>
+ {
+ db.Updateable(ScanList, UserCode).UpdateColumns(q => new { q.UPDATE_TIME, q.UPDATE_USER, q.STATUS }).ExecuteCommandAsync();
+ //db.Updateable(items, UserCode).ExecuteCommand();
+ //db.Insertable(historys, UserCode).ExecuteCommand();
+ });
+ if (dbTran.IsSuccess)
+ {
+ ScanList.Clear();
+ }
+ else
+ {
+ Logger.Default.Fatal(dbTran.ErrorException, "Database transaction save exception");
+ //鎶涘嚭寮傚父
+ throw dbTran.ErrorException;
+ }
+ }
+ catch (System.Exception ex)
+ {
+ //return action.CatchExceptionWithLog(ex, Biz.L("鍒犻櫎褰撳墠鎵�鏈夊凡娓呯偣璁板綍寮傚父"));
+ return action.CatchExceptionWithLog(ex, Biz.L("WMS.Print_BIZ_U9_ASN.DeleteScanListException"));
+ }
+ return action;
+ }
+
+ /// <summary>
+ /// 鍒犻櫎褰撳墠鐢ㄦ埛鐨勫凡鎵崟涓褰�
+ /// </summary>
+ /// <returns></returns>
+ public async Task<ApiAction> DeleteScannedSn(BaseInput input)
+ {
+ var action = new ApiAction();
+ try
+ {
+ //var item = await Biz.Db.Queryable<WMS_ITEM>().Where(q => q.SN == input.SN).FirstAsync();
+ //var order = item.TRANS_CODE;
+ //item.STATUS = WMS_ITEM.STATUSs.Incoming.GetValue();
+ //item.SOURCE_CODE = "";
+ //item.SOURCE_ORDER = "";
+ //item.SOURCE_LINE = "";
+ //item.TRANS_CODE = item.SOURCE_CODE;
+ //item.TRANS_NO = item.SOURCE_ORDER;
+ //item.TRANS_LINE = item.SOURCE_LINE;
+
+ //浣跨敤缁熶竴鐨勪簨鍔B瀵硅薄
+ var db = GetCommitDB();
+ var dbTran = db.UseTran(() =>
+ {
+ db.Updateable<BIZ_U9_ASN_SN>(UserCode).SetColumns(q => q.STATUS == WMS_ITEM.STATUSs.Incoming.GetValue())
+ .SetColumns(q => q.RECEIVER == null)
+ .SetColumns(q => q.RECEIVE_DATE == DateTime.MinValue)
+ .Where(q => q.SN == input.SN).ExecuteCommand();
+ //db.Updateable(item, UserCode).ExecuteCommand();
+ //db.Insertable(new WMS_ITEM_HIS(item, $"鏉＄爜[{item.SN}]鍙栨秷娓呯偣锛屾搷浣滃崟鎹甗{order}]"), UserCode).ExecuteCommand();
+ });
+ if (dbTran.IsSuccess)
+ {
+ ScanList.RemoveAll(q => q.SN == input.SN);
+ }
+ else
+ {
+ Logger.Default.Fatal(dbTran.ErrorException, "Database transaction save exception");
+ //鎶涘嚭寮傚父
+ throw dbTran.ErrorException;
+ }
+ }
+ catch (System.Exception ex)
+ {
+ //return action.CatchExceptionWithLog(ex, Biz.L("鍒犻櫎宸叉竻鐐规潯鐮乕{0}]寮傚父"));
+ return action.CatchExceptionWithLog(ex, Biz.L("WMS.Print_BIZ_U9_ASN.DeleteScannedSnException", input.SN));
+ }
+ return action;
+ }
+
+ /// <summary>
+ /// 鑾峰彇鏈宸叉竻鐐圭殑鐗╂枡鍒楄〃锛堝甫鍒嗛〉锛�
+ /// </summary>
+ /// <returns></returns>
+ public async Task<ApiAction<PageAble<BIZ_U9_ASN_SN>>> GetScannedList(BaseInputWithPage input)
+ {
+ var action = new ApiAction<PageAble<BIZ_U9_ASN_SN>>();
+ action.Data = new PageAble<BIZ_U9_ASN_SN>();
+ action.Data.pageSize = input.pageSize;
+ action.Data.pageIndex = input.pageIndex;
+ action.Data.totals = ScanList.Count;
+ action.Data.data = ScanList.Skip((input.pageIndex - 1) * input.pageSize).Take(input.pageSize).ToList();
+ //action.Data = query;
+ return action;
+ }
+
+ /// <summary>
+ /// 鑾峰彇褰撳墠鎵�鏈夊崟鎹俊鎭�
+ /// </summary>
+ /// <returns></returns>
+ public async Task<ApiAction<List<BIZ_U9_ASN>>> GetOrderList()
+ {
+ var action = new ApiAction<List<BIZ_U9_ASN>>();
+ action.Data = await Biz.Db.Queryable<BIZ_U9_ASN>().Where(q => OrderList.Contains(q.ORDER_NO)).IncludesAllFirstLayer().ToListAsync();
+ if (!action.Data.IsNullOrEmpty())
+ {
+ foreach (var order in action.Data)
+ {
+ foreach (var dtl in order.Details)
+ {
+ dtl.SnList = order.SnList.Where(q => q.LINE_NO == dtl.LINE_NO).OrderByDescending(q => q.STATUS).ToList();
+ dtl.QTY_COUNTED = dtl.SnList.Where(q => q.STATUS == WMS_ITEM.STATUSs.Counted.GetValue() || q.STATUS == WMS_ITEM.STATUSs.Rejected.GetValue()).Sum(q => q.QTY);
+ }
+ order.IsFinished = !order.Details.Where(q => q.QTY != q.QTY_COUNTED).Any();
+ }
+ }
+ return action;
+ }
+
+ /// <summary>
+ /// 鐢熸垚鏀惰揣鍗曪細璋冪敤U9鏂板鏀惰揣鍗曟帴鍙�
+ /// </summary>
+ /// <returns></returns>
+ public async Task<ApiAction> SetGiftQty(BaseInput input)
+ {
+ var action = new ApiAction();
+ try
+ {
+ var dtl = input?.Data?.JsonToObject<BIZ_U9_ASN_DTL>();
+ if ((dtl?.ID ?? "").IsNullOrEmpty())
+ {
+ action.IsSuccessed = false;
+ //action.LocaleMsg = Biz.L($"鎻愪氦鐨勬敹璐у崟鏄庣粏ID涓嶈兘涓虹┖");
+ action.LocaleMsg = Biz.L("WMS.Print_BIZ_U9_ASN.SetGiftQty.DetailIDIsNull");
+ return action;
+ }
+
+ //浣跨敤缁熶竴鐨勪簨鍔B瀵硅薄
+ var db = GetCommitDB();
+ await db.Updateable(dtl, UserCode).UpdateColumns(q => new { q.UPDATE_TIME, q.UPDATE_USER, q.QTY_GIFT }).ExecuteCommandAsync();
+ }
+ catch (System.Exception ex)
+ {
+ //return action.CatchExceptionWithLog(ex, Biz.L("璁剧疆鏀惰揣鍗曟槑缁嗚禒鍝佹暟閲忎负寮傚父"));
+ return action.CatchExceptionWithLog(ex, Biz.L("WMS.Print_BIZ_U9_ASN.SetGiftQtyException"));
+ }
+ return action;
+ }
+
+ /// <summary>
+ /// 鐢熸垚鏀惰揣鍗曪細璋冪敤U9鏂板鏀惰揣鍗曟帴鍙�
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ public async Task<ApiAction> GenerateReceipt(BaseInput input)
+ {
+ var action = new ApiAction();
+ var orderNo = input.Data;
+ try
+ {
+ var order = await MainDB.Queryable<BIZ_U9_ASN>().Where(q => q.ORDER_NO == orderNo).IncludesAllFirstLayer().FirstAsync();
+ if (order.IsNullOrEmpty())
+ {
+ action.IsSuccessed = false;
+ //action.LocaleMsg = Biz.L($"鎵句笉鍒伴�佽揣鍗昜{0}]鐨勫崟鎹俊鎭紝璇锋彁浜ゆ纭殑鍗曞彿");
+ action.LocaleMsg = Biz.L("WMS.Print_BIZ_U9_ASN.GenerateReceipt.ASNNotExists", orderNo);
+ return action;
+ }
+ //楠岃瘉鏉＄爜鏄惁姝ｇ‘
+ if (order.STATUS != BIZ_U9_ASN.STATUSs.Counting.GetValue())
+ {
+ action.IsSuccessed = false;
+ //action.LocaleMsg = Biz.L("鐢熸垚鏀惰揣鍗曪細閫佽揣鍗曠姸鎬乕{0}]寮傚父");
+ action.LocaleMsg = Biz.L("WMS.Print_BIZ_U9_ASN.GenerateReceipt.StatusException", order.STATUS.GetEnumDesc<BIZ_U9_ASN.STATUSs>());
+ return action;
+ }
+
+ //鏌ヨ鏄惁娓呯偣瀹屾垚
+ var noFinish = order.Details.Where(q => q.QTY != order.SnList.Where(s => s.LINE_NO == q.LINE_NO && (s.STATUS == WMS_ITEM.STATUSs.Counted.GetValue() || q.STATUS == WMS_ITEM.STATUSs.Rejected.GetValue())).Sum(s => s.QTY));
+ if (noFinish.Any())
+ {
+ action.IsSuccessed = false;
+ //action.LocaleMsg = Biz.L("閫佽揣鍗昜{0}]鏈竻鐐瑰畬鎴愶紝璇峰厛娓呯偣瀹屾垚锛屾湭瀹屾垚娓呯偣鐨勮鍙峰涓嬶細{1}");
+ action.LocaleMsg = Biz.L("WMS.Print_BIZ_U9_ASN.GenerateReceipt.NoFinishCounting", orderNo, string.Join("锛�", noFinish.Select(q => q.LINE_NO)));
+ return action;
+ }
+
+ var iInput = new CreateRcvBySrcASNInput
+ {
+ userId = UserCode,
+ IsLogin = true,
+ CreateRcvBySrcASNParam = new()
+ {
+ aSNToRcvTransDTOs = order.Details.Select(q => new ASNToRcvTransDTO { ASNLineKey = q.ID, TransQty = new() { m_amount1 = q.QTY } }).ToList(),
+ }
+ };
+ var result = await DI.Resolve<IWMS_U9C>().CreateRcvBySrcASN(iInput);
+ if (!result.IsSuccessed)
+ {
+ action.IsSuccessed = false;
+ action.LocaleMsg = result.LocaleMsg;
+ return action;
+ }
+
+ //鏍规嵁鎺ュ彛杩斿洖鏀惰揣鍗曞崟鍙锋煡璇㈠崟鎹槑缁嗭紝骞跺垱寤烘潯鐮佹槑缁�
+ var receipt = new BIZ_U9_RECEIPT();
+ receipt.Details = new();
+ receipt.SnList = new();
+ DbClient U9Cdb = Biz.DataSource["YadaU9C"].Client;
+ var list = U9Cdb.Queryable<mes_ReturnedDocInfo>().Where(x => x.RcvId == result.Data[0].ID.ToDouble() && x.DocNo == result.Data[0].Code).ToList();
+
+ if (list != null && list.Count > 0)
+ {
+ receipt.ID = list.First().RcvId.ToString();
+ receipt.AUTH_ORG = order.AUTH_ORG;
+ receipt.STATUS = BIZ_U9_RECEIPT.STATUSs.InQC.GetValue();
+ receipt.ORDER_NO = list.First().DocNo;
+ receipt.SUPP_CODE = list.First().SupplierCode;
+ receipt.SUPP_NAME = list.First().SupplierName;
+ receipt.RECEIVER = UserCode;
+ receipt.RECEIVE_DATE = DateTime.Now;
+ receipt.ASN_ID = order.ID;
+ receipt.ASN_NO = order.ORDER_NO;
+ receipt.ORDER_DATE = list.First().ModifiedOn;
+ receipt.HANDLED = 0;
+ receipt.HANDLED_DATE = DateTime.Now;
+
+ foreach (var item in list)
+ {
+ var asnDtl = order.Details.First(q => q.ID == item.SrcASNDocLineId.ToString());
+ BIZ_U9_RECEIPT_DTL receiptDt = new()
+ {
+ ID = item.RcvLineId.ToString(),
+ AUTH_ORG = receipt.AUTH_ORG,
+ STATUS = BIZ_U9_RECEIPT.STATUSs.InQC.GetValue(),
+ ORDER_NO = item.DocNo,
+ LINE_NO = item.DocLineNo.ToString(),
+ ITEM_CODE = item.ItemCode,
+ QTY = item.EyeballingQtyTU.ToDouble(), // mes鍗曟嵁鏁伴噺 --U9閫�琛ユ暟閲�
+ QTY_GIFT = asnDtl.QTY_GIFT,
+ ASN_ID = item.SrcASNDocId.ToString(),
+ ASN_NO = asnDtl.ORDER_NO,
+ ASN_LINE_ID = item.SrcASNDocLineId.ToString(),
+ ASN_LINE = asnDtl.LINE_NO,
+ ERP_CODE = item.ItemCode1,
+ };
+ receipt.Details.Add(receiptDt);
+ }
+
+ foreach (var sn in order.SnList)
+ {
+ var dtl = receipt.Details.First(q => q.ASN_LINE == sn.LINE_NO);
+ BIZ_U9_RECEIPT_SN receiptSn = new()
+ {
+ AUTH_ORG = dtl.AUTH_ORG,
+ ORDER_NO = dtl.ORDER_NO,
+ LINE_NO = dtl.LINE_NO,
+ SN = sn.SN,
+ META_SN = sn.META_SN,
+ ITEM_CODE = sn.ITEM_CODE,
+ STATUS = WMS_ITEM.STATUSs.WaitIn.GetValue(),
+ QTY = sn.QTY,
+ UNIT = sn.UNIT,
+ IS_OK = sn.IS_OK,
+ IS_IN = sn.IS_IN,
+ LOTNO = sn.LOTNO,
+ CARTON_NO = sn.CARTON_NO,
+ PALLET_NO = sn.PALLET_NO,
+ };
+ receipt.SnList.Add(receiptSn);
+ }
+ }
+
+ //鏇存柊搴撳瓨琛ㄤ俊鎭�
+ var items = MainDB.Queryable<WMS_ITEM>().Where(q => SqlFunc.Subqueryable<BIZ_U9_ASN_SN>().Where(s => s.SN == q.SN && s.ORDER_NO == order.ORDER_NO).Any()).ToList();
+ var historys = new List<WMS_ITEM_HIS>();
+ foreach (var item in items)
+ {
+ item.AUTH_ORG = receipt.AUTH_ORG;
+ item.STATUS = WMS_ITEM.STATUSs.WaitIn.GetValue();
+ 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 = receipt.SnList.First(q => q.SN == item.SN).LINE_NO;
+ historys.Add(new WMS_ITEM_HIS(item, $"閫佽揣鍗昜{order.ORDER_NO}]鐨勬潯鐮乕{item.SN}]鐢熸垚鏀惰揣鍗昜{receipt.ORDER_NO}]锛屽緟妫�楠屽畬鎴愬悗鍙叆搴�"));
+ }
+ var pkgs = MainDB.Queryable<WMS_ITEM_PKG>().Where(q => SqlFunc.Subqueryable<BIZ_U9_ASN_SN>().Where(s => s.SN == q.SN && s.ORDER_NO == order.ORDER_NO).Any()).ToList();
+ foreach (var item in pkgs)
+ {
+ item.AUTH_ORG = receipt.AUTH_ORG;
+ 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 = receipt.SnList.First(q => q.SN == item.SN).LINE_NO;
+ }
+ order.STATUS = BIZ_U9_ASN.STATUSs.Finished.GetValue();
+ order.RECEIVER_ID = receipt.ID;
+ order.RECEIVER_NO = receipt.ORDER_NO;
+ order.RECEIVER = UserCode;
+ order.RECEIVE_DATE = DateTime.Now;
+
+ //浣跨敤缁熶竴鐨勪簨鍔B瀵硅薄
+ var db = GetCommitDB();
+ var dbTran = db.UseTran(() =>
+ {
+ db.Updateable(items, UserCode).UpdateColumns(q => new { q.UPDATE_TIME, q.UPDATE_USER, q.AUTH_ORG, q.STATUS, q.TRANS_CODE, q.TRANS_NO, q.TRANS_LINE, q.SOURCE_CODE, q.SOURCE_ORDER, q.SOURCE_LINE }).ExecuteCommand();
+ db.Updateable(pkgs, UserCode).UpdateColumns(q => new { q.UPDATE_TIME, q.UPDATE_USER, q.AUTH_ORG, q.TRANS_CODE, q.TRANS_NO, q.TRANS_LINE, q.SOURCE_CODE, q.SOURCE_ORDER, q.SOURCE_LINE }).ExecuteCommand();
+ db.Insertable(historys, UserCode).ExecuteCommand();
+ db.Updateable(order, UserCode).UpdateColumns(q => new { q.UPDATE_TIME, q.UPDATE_USER, q.STATUS, q.RECEIVER, q.RECEIVE_DATE, q.RECEIVER_ID, q.RECEIVER_NO }).ExecuteCommand();
+ db.Insertable(receipt, UserCode).ExecuteCommand();
+ db.Insertable(receipt.Details, UserCode).ExecuteCommand();
+ db.Insertable(receipt.SnList, UserCode).ExecuteCommand();
+ });
+ if (dbTran.IsSuccess)
+ {
+ //action.LocaleMsg = Biz.L($"閫佽揣鍗昜{0}]鐢熸垚鏀惰揣鍗昜{1}]鎴愬姛");
+ action.LocaleMsg = Biz.L("WMS.Print_BIZ_U9_ASN.GenerateReceipt.Success", order.ORDER_NO, receipt.ORDER_NO);
+ }
+ else
+ {
+ Logger.Default.Fatal(dbTran.ErrorException, "Database transaction save exception");
+ //鎶涘嚭寮傚父
+ throw dbTran.ErrorException;
+ }
+ }
+ catch (System.Exception ex)
+ {
+ //return action.CatchExceptionWithLog(ex, Biz.L("閫佽揣鍗昜{0}]鐢熸垚鏀惰揣鍗曞紓甯�"));
+ return action.CatchExceptionWithLog(ex, Biz.L("WMS.Print_BIZ_U9_ASN.GenerateReceiptException", orderNo));
+ }
+ return action;
}
#endregion
@@ -413,17 +566,10 @@
public override void ResetScan()
{
base.ResetScan();
- ResetScanInfo();
- CurScanShelf = null;
- }
-
- /// <summary>
- /// 閲嶇疆鎵爜淇℃伅
- /// </summary>
- public void ResetScanInfo()
- {
Command = null;
CurInvItem = null;
+ CurScanShelf = null;
+ CurSn = null;
}
public override bool Close(bool needSaveHistoryLog = false)
--
Gitblit v1.9.3