From eb0ad83719de660e5c4f7676aea4710625b6bd51 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期四, 19 十二月 2024 21:55:43 +0800
Subject: [PATCH] WMS增加标准上下架功能事务
---
Tiger.Business.WMS/Transaction/Old/CustSupplyCheckingNew.cs | 50 +++++++++++++++++++++++++-------------------------
1 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/Tiger.Business.WMS/Transaction/CustSupplyCheckingNew.cs b/Tiger.Business.WMS/Transaction/Old/CustSupplyCheckingNew.cs
similarity index 95%
rename from Tiger.Business.WMS/Transaction/CustSupplyCheckingNew.cs
rename to Tiger.Business.WMS/Transaction/Old/CustSupplyCheckingNew.cs
index 341b8df..0263a49 100644
--- a/Tiger.Business.WMS/Transaction/CustSupplyCheckingNew.cs
+++ b/Tiger.Business.WMS/Transaction/Old/CustSupplyCheckingNew.cs
@@ -38,7 +38,7 @@
#region Propertys & Variables
public string UserCode { get; set; }
- public static long UserId { get; set; }
+ public long UserId { get; set; }
public string VenderCode { get; set; }
public string LotNo { get; set; }
public string SecondVenderCode { get; set; }
@@ -135,53 +135,53 @@
return action;
}
input.AuthOption.OrgCode = input.AuthOption.OrgCode.IsNullOrEmpty() ? input.AuthOption.CurOrg : input.AuthOption.OrgCode;
- Result<Inventory> result = WMS_ITEM_Biz.WmsItem.GetK(input.SN, input.AuthOption, false);
+ Result<IInventory> result = WMS_ITEM_Biz.WmsItem.GetK(input.SN, input.AuthOption, false);
if (result.Flag != Result.Flags.Success)
{
action.IsSuccessed = false;
action.LocaleMsg = result.LocaleMsg;
return action;
}
- var curBarcode = result.Data;
- if (!curBarcode.IsQRCode)
+ var curInv = result.Data as Inventory;
+ if (!curInv.IsQRCode)
{
action.IsSuccessed = false;
- action.LocaleMsg = Biz.L("WMS.CustSupChk.ScanItem.NotQrCode", curBarcode.Barcode.MetaSn);
+ action.LocaleMsg = Biz.L("WMS.CustSupChk.ScanItem.NotQrCode", curInv.Barcode.MetaSn);
return action;
}
//鍒ゆ柇鏉＄爜鏄惁涓烘渶灏戝寘瑁�
- if (!new[] { Barcode.Types.Small, Barcode.Types.Other }.Contains(curBarcode.Barcode.Type))
+ if (!new[] { Barcode.Types.Small, Barcode.Types.Other }.Contains(curInv.Barcode.Type))
{
action.IsSuccessed = false;
- action.LocaleMsg = Biz.L("WMS.CustSupChk.ScanItem.TypeError", curBarcode.SN);
+ action.LocaleMsg = Biz.L("WMS.CustSupChk.ScanItem.TypeError", curInv.SN);
return action;
}
- if (curBarcode.Items.Any())
+ if (curInv.Items.Any())
{
action.IsSuccessed = false;
- action.LocaleMsg = Biz.L("WMS.CustSupChk.ScanItem.ExistItem", curBarcode.ItemInfo?.ITEM_CODE);
+ action.LocaleMsg = Biz.L("WMS.CustSupChk.ScanItem.ExistItem", curInv.ItemInfo?.ITEM_CODE);
return action;
}
- if (string.IsNullOrEmpty(curBarcode.ItemInfo?.ITEM_CODE))
+ if (string.IsNullOrEmpty(curInv.ItemInfo?.ITEM_CODE))
{
action.IsSuccessed = false;
- action.LocaleMsg = Biz.L("WMS.CustSupChk.ScanItem.NotFound", curBarcode.ItemInfo?.ITEM_CODE);
+ action.LocaleMsg = Biz.L("WMS.CustSupChk.ScanItem.NotFound", curInv.ItemInfo?.ITEM_CODE);
return action;
}
// 鍏跺畠鍏ュ簱娓呯偣涓嶈兘鎵叆鎷嗗寘鍚庡甫-1鐨勬爣绛�
- if (curBarcode.isNormalStatus && curBarcode.Status == WMS_ITEM.STATUSs.WaitIn)
+ if (curInv.isNormalStatus && curInv.Status == WMS_ITEM.STATUSs.WaitIn)
{
action.IsSuccessed = false;
- action.LocaleMsg = Biz.L("WMS.CustSupChk.ScanItem.NotAllowIn", curBarcode.ItemInfo?.ITEM_CODE);
+ action.LocaleMsg = Biz.L("WMS.CustSupChk.ScanItem.NotAllowIn", curInv.ItemInfo?.ITEM_CODE);
return action;
}
//鐗╂枡楠岃瘉
- if (curBarcode.ItemInfo.IsNullOrEmpty() || curBarcode.ItemInfo.IS_ACTIVE == "N")
+ if (curInv.ItemInfo.IsNullOrEmpty() || curInv.ItemInfo.IS_ACTIVE == "N")
{
action.IsSuccessed = false;
- action.LocaleMsg = Biz.L("WMS.ProdMReq.ScanItem.ItemCodeNotExistsOrNotActive", curBarcode.ItemInfo.ITEM_CODE.IsNullOrEmpty(curBarcode.Barcode.ItemCode));
+ action.LocaleMsg = Biz.L("WMS.ProdMReq.ScanItem.ItemCodeNotExistsOrNotActive", curInv.ItemInfo.ITEM_CODE.IsNullOrEmpty(curInv.Barcode.ItemCode));
return action;
}
OrgCode = input.AuthOption.CurOrg;
@@ -203,10 +203,10 @@
ID = Guid.NewGuid().ToString(),
BUSINESSCODE = UserCode,
WAREHOUSECODE = WarehouseCode,
- SN = curBarcode.SN,
- ITEM_CODE = curBarcode.ItemInfo.ITEM_CODE,
- QTY = curBarcode.Barcode.Qty ?? 0,
- DATECODE = curBarcode.Barcode.ProdDate ?? DateTime.MinValue,
+ SN = curInv.SN,
+ ITEM_CODE = curInv.ItemInfo.ITEM_CODE,
+ QTY = curInv.Barcode.Qty ?? 0,
+ DATECODE = curInv.Barcode.ProdDate ?? DateTime.MinValue,
LOTNO = LotNo, //item.Barcode.LotNo,
STATUS = WMS_ITEM.STATUSs.Counted.GetValue(),
META_SN = input.SN,
@@ -225,17 +225,17 @@
STATUS = scanResult.STATUS,
WH_CODE = scanResult.WAREHOUSECODE,
WH_NAME = WarehouseName,
- MName = curBarcode.ItemInfo.ITEM_NAME,
- MDesc = curBarcode.ItemInfo.SPEC,
- MUom = curBarcode.ItemInfo.UNIT
+ MName = curInv.ItemInfo.ITEM_NAME,
+ MDesc = curInv.ItemInfo.SPEC,
+ MUom = curInv.ItemInfo.UNIT
};
//楠岃瘉鏉＄爜鏄惁宸插仛杩囨竻鐐�
- var nLogs = Biz.Db.Queryable<BIZ_ERP_OTH_IN_SN>().Where(t => t.SN.ToUpper() == curBarcode.SN.ToUpper()).First();
+ var nLogs = Biz.Db.Queryable<BIZ_ERP_OTH_IN_SN>().Where(t => t.SN.ToUpper() == curInv.SN.ToUpper()).First();
if (nLogs != null)
{
action.IsSuccessed = false;
- action.LocaleMsg = Biz.L("WMS.CustSupChk.ScanItem.BarcodeCounted", curBarcode.SN);
+ action.LocaleMsg = Biz.L("WMS.CustSupChk.ScanItem.BarcodeCounted", curInv.SN);
return action;
}
@@ -247,7 +247,7 @@
AUTH_ORG = input.AuthOption.CurOrg,
CREATE_USER = UserCode,
OrderNo = UserCode,
- Barcodes = curBarcode.SN,
+ Barcodes = curInv.SN,
CustomsNo = CustomsNo.Replace("锛�", ",").Trim().Split(',')[0],
AccountingNo = CustomsNo.Replace("锛�", ",").Trim().Split(',')[1],
CountsType = BIZ_ERP_CUSTOMS.CountsEnum.Incoming
--
Gitblit v1.9.3