TigerClouds-Tech/Server/TigerApi6_2024.git

			@@ -11,9 +11,9 @@
			using Tiger.IBusiness;
			using Tiger.Model.Sharetronic.Shelf;
			using Tiger.Business.WMS.Sharetronic.Shelf;
			using Microsoft.IdentityModel.Tokens;
			using Apache.NMS.ActiveMQ.Commands;
			//using Microsoft.IdentityModel.Tokens;
			using Tiger.Model.MES.Yada;
			using static IronPython.Modules.PythonThread;
			using Tiger.Model.Entitys.MES.Position;

			namespace Tiger.Business.WMS.Transaction
			@@ -21,25 +21,17 @@
			/// <summary>
			/// 标准上架事务
			/// </summary>
			public class In_Default : WMSTransactionBase, IIn_Default
			public class In_Default : WmsTask, IIn_Default
			{
			public IIn_Default Init(string id, string userCode, string apiHost, string orgCode)
			{
			TransID = id;
			UserCode = userCode;
			ApiHost = apiHost;
			OrgCode = orgCode;
			base.Init(id, userCode, apiHost, orgCode);
			Logger.Console.Info($"Start {this.GetType().Name} Transaction[ID: {TransID}]");
			return this;
			}

			#region Propertys & Variables
			public string UserCode { get; set; }
			public long UserId { get; set; }
			public string OrgCode { get; set; }
			public Inventory CurInvItem { get; set; }
			public ScanShelfInfo CurScanShelf { get; set; }
			public string Command { get; set; } = "Normal";

			#endregion

			#region Functions
			@@ -48,7 +40,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())
			@@ -59,9 +51,9 @@
			return SetOutPutMqttMsg(action, input.Locale);
			}
			//判断扫描的是否货架
			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();
			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())
			if (!whUnit.IsNullOrEmpty() \|\| string.IsNullOrEmpty(CurScanShelf?.ShelfCode))
			{
			action = await ScanShelf(input.SN, whUnit);
			}
			@@ -73,7 +65,7 @@
			catch (Exception ex)
			{
			//取消当前操作
			ResetInfo();
			ResetTrans();
			//action.CatchExceptionWithLog(ex, $"扫描[{input.SN}]异常");
			action.CatchExceptionWithLog(ex, Biz.L("WMS.Default.Scan.ScanException", input.SN));
			}
			@@ -90,13 +82,14 @@
			{
			if (CurInvItem.IsNullOrEmpty())
			{
			Result<IInventory> result = WMS_ITEM_Biz.WmsItem.Get(input.SN, input.AuthOption, true);
			//解析条码
			Result<IInventory> result = GetInventory(input.SN, input.AuthOption, true);
			if (!result.IsSuccessed)
			{
			action.IsSuccessed = false;
			action.LocaleMsg = result.LocaleMsg;
			return action;
			}
			return SetOutPutMqttMsg(action, input.Locale);
			}
			var inv = result.Data as Inventory;

			//验证条码是否正确
			@@ -105,73 +98,69 @@
			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;
			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 action;
			action.LocaleMsg = Biz.L("WMS.Default.ScanItem.ItemCodeNotExistsOrNotActive", inv.ItemInfo?.ITEM_CODE.IsNullOrEmpty(inv.Barcode.ItemCode));
			return SetOutPutMqttMsg(action, input.Locale);
			}

			if (inv.Items.Count == 0)
			{
			List<WMS_ITEM_HIS> ItemHistorys = new List<WMS_ITEM_HIS>();
			WMS_ITEM Item;
			WMS_ITEM_PKG ItemPkgs;

			Item = new()
			var newItem = new WMS_ITEM()
			{
			SN = inv.Barcode.SN,
			ITEM_CODE = inv.Barcode.ItemCode,
			AUTH_ORG = input.AuthOption.CurOrg,
			STATUS = WMS_ITEM.STATUSs.WaitIn.GetValue(),
			QTY = inv.Barcode.Qty.ToDecimal(),
			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()
			WMS_ITEM_HIS his = new(newItem, $"标准上架入库");
			var newPkg = new WMS_ITEM_PKG()
			{
			SN = inv.Barcode.SN,
			AUTH_ORG = input.AuthOption.CurOrg,
			ITEM_CODE = inv.Barcode.ItemCode,
			QTY = inv.Barcode.Qty.ToDecimal(),
			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)
			foreach (var ext in noExt)
			{
			inv.ItemsExt.Add(new()
			{
			SN = item.SN,
			SN = ext.SN,
			META_SN = inv.Barcode.MetaSn,
			QR_CODE = inv.Barcode.MetaSn
			});
			}

			inv.Items.Add(Item);
			inv.Items.Add(newItem);
			inv.History.Add(his);
			inv.Packages.Add(ItemPkgs);
			inv.Packages.Add(newPkg);
			}
			else if (inv.Items.Count == 1)
			{
			inv.Items.First().QTY = inv.Barcode.Qty.ToDecimal();
			inv.Items.First().ERP_WH = CurScanShelf.WarehouseCode;
			inv.Items.First().AUTH_ORG = input.AuthOption.CurOrg;
			//雅达不从条码上更新数量
			//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.ToDecimal();
			inv.Packages.First().ERP_WH = CurScanShelf.WarehouseCode;
			inv.Packages.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
			{
			@@ -186,23 +175,24 @@
			item.AUTH_ORG = input.AuthOption.CurOrg;
			}
			}
			CurInvItem = inv;

			//检查物料数量，如果没有则查询雅达条码主档，把数量返回前端确认
			if (inv.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 => inv.Items.Select(q => q.SN).Contains(q.Code)).ToList();
			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 = inv.Items.First(q => q.SN == qty.Code);
			var item = CurInvItem.Items.First(q => q.SN == qty.Code);
			item.QTY = qty.WhQty;
			item.SUPP_LOTNO = CurInvItem.Barcode.LotNo;
			}
			action.Data.Data = inv.Items.Select(q => new { q.SN, q.QTY });
			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;
			return SetOutPutMqttMsg(action, input.Locale);
			}
			CurInvItem = inv;
			}

			//更新已确认物料数量
			@@ -215,8 +205,8 @@
			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;
			action.LocaleMsg = Biz.L("WMS.Default.ScanItem.ReComfirmQty", input.SN);
			return SetOutPutMqttMsg(action, input.Locale);
			}
			else
			{
			@@ -224,7 +214,11 @@
			{
			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";
			}
			}
			@@ -238,7 +232,7 @@
			{
			action.IsSuccessed = false;
			action.LocaleMsg = Biz.L(shelfApiResult.GetData<string>());
			return action;
			return SetOutPutMqttMsg(action, input.Locale);
			}
			var reaultShelf = shelfApiResult.GetData<ShelfChangeModel>();

			@@ -248,15 +242,15 @@
			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 action;
			return SetOutPutMqttMsg(action, input.Locale);
			}
			var locationData = Biz.Db.Queryable<WMS_ITEM>().Where(q => q.LOCATION_ID == nLocation.ID).First();
			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 action;
			return SetOutPutMqttMsg(action, input.Locale);
			}
			CurScanShelf.LocationCode = nLocation.LOCATION_CODE;
			}
			@@ -267,10 +261,10 @@
			action.IsSuccessed = false;
			//action.LocaleMsg = Biz.L("请输入或扫描有效的货架/储位码");
			action.LocaleMsg = Biz.L("WMS.Default.ScanShelf.ShelfCanNotEmpty");
			return action;
			return SetOutPutMqttMsg(action, input.Locale);
			}

			nLocation = await Biz.Db.Queryable<WMS_LOCATION>().Where(t => t.LOCATION_CODE == CurScanShelf.LocationCode && t.AUTH_ORG == OrgCode).FirstAsync();
			nLocation = await MainDB.Queryable<WMS_LOCATION>().Where(t => t.LOCATION_CODE == CurScanShelf.LocationCode && t.AUTH_ORG == OrgCode).FirstAsync();
			}

			//判断储位是否单放
			@@ -279,70 +273,41 @@
			action.IsSuccessed = false;
			//action.LocaleMsg = Biz.L("储位[{0}]只能存放一个物料");
			action.LocaleMsg = Biz.L("WMS.Default.ScanItem.LocationSingleFailure", nLocation.LOCATION_CODE);
			CurInvItem = null;
			return action;
			ResetTrans();
			return SetOutPutMqttMsg(action, input.Locale);
			}

			//执行上架
			//执行上架数据处理
			foreach (var item in CurInvItem.Items)
			{
			item.TRANS_CODE = "In_Default";
			item.TRANS_NO = $"In_Default_{DateTime.Now:yyyyMMdd}";
			}
			Result<PutOnInfo> putonResult = WMS_ITEM_Biz.WmsItem.PutOn(CurInvItem, input.AuthOption, nLocation.LOCATION_CODE);
			foreach (var item in CurInvItem.Packages)
			{
			item.TRANS_CODE = "In_Default";
			item.TRANS_NO = $"In_Default_{DateTime.Now:yyyyMMdd}";
			}
			Result putonResult = PutOn(input.AuthOption, nLocation.LOCATION_CODE);
			if (!putonResult.IsSuccessed)
			{
			action.IsSuccessed = false;
			action.LocaleMsg = putonResult.LocaleMsg;
			CurInvItem = null;
			return action;
			ResetTrans();
			return SetOutPutMqttMsg(action, input.Locale);
			}
			PutOnInfo putOnInfo = putonResult.Data;

			//保存到数据库
			var db = Business.Biz.Db;
			var dbTran = db.UseTran(() =>
			{
			//入库
			db.Storageable(putOnInfo.Items, UserCode).ExecuteCommand();
			db.Storageable(putOnInfo.Packages, UserCode).ExecuteCommand();
			db.Insertable(putOnInfo.History, UserCode).ExecuteCommand();
			var x = db.Storageable(putOnInfo.ItemsExt, 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 = new DefaultInStoreOutput
			{
			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 = putOnInfo.Warehouse.WH_CODE,
			RegionCode = putOnInfo.Region.REGION_CODE,
			ShelfCode = putOnInfo.Shelf.SHELF_CODE,
			LocationCode = putOnInfo.Location.LOCATION_CODE,
			};

			//action.LocaleMsg = Biz.L($"扫描条码[{0}]上架到储位[{1}]成功");
			action.LocaleMsg = Biz.L("WMS.Default.ScanItem.PutOnSucceeded", CurInvItem.SN, putOnInfo.Location.LOCATION_CODE);
			CurInvItem = null;
			//完成所有处理后使用事务保存数据
			action = DoIfFinish(action, input.Locale);
			}
			catch (Exception ex)
			{
			//取消当前操作
			ResetInfo();
			ResetTrans();
			//action.CatchExceptionWithLog(ex, $"扫描条码[{input.SN}]复核异常");
			action.CatchExceptionWithLog(ex, Biz.L("WMS.Default.ScanItem.ScanException", input.SN));
			}
			return action;
			return SetOutPutMqttMsg(action, input.Locale);
			}

			/// <summary>
			@@ -364,7 +329,7 @@
			CurScanShelf = new ScanShelfInfo();

			// 查询货架信息
			whUnit = whUnit.IsNullOrEmpty(await Biz.Db.Queryable<V_WH_UNIT>().Where(t => (t.SHELF_CODE.ToUpper() == Code \|\| t.LOCATION_CODE.ToUpper() == Code) && t.AUTH_ORG == OrgCode).IncludesAllFirstLayer().FirstAsync());
			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)
			@@ -379,7 +344,7 @@
			// 扫描库位代码
			else if (!whUnit.IsNullOrEmpty() && whUnit.LOCATION_CODE == Code)
			{
			//var nLocation = await Biz.Db.Queryable<V_WH_UNIT>().Where(t => t.LOCATION_CODE.ToUpper() == Code.ToUpper() && t.AUTH_ORG == OrgCode).IncludesAllFirstLayer().FirstAsync();
			//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;
			@@ -396,7 +361,7 @@
			}
			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();
			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;
			@@ -429,24 +394,70 @@
			catch (Exception ex)
			{
			//取消当前操作
			ResetInfo();
			ResetTrans();
			//action.CatchExceptionWithLog(ex, $"扫描货架/储位[{0}]异常");
			action.CatchExceptionWithLog(ex, Biz.L("WMS.Default.ScanShelf.ScanException", Code));
			}
			return action;
			}

			/// <summary>
			/// 完成所有处理后使用事务保存数据
			/// </summary>
			/// <param name="action"></param>
			/// <param name="locale"></param>
			/// <param name="doAfterSave"></param>
			/// <returns></returns>
			public ApiAction<ScanOutput> DoIfFinish(ApiAction<ScanOutput> action, string locale, Action doAfterSave = null)
			{
			//保存数据库
			SaveCommitListToDB();

			//保存数据成功后执行
			doAfterSave?.Invoke();

			// 返回数据
			action.Data.Data = new DefaultInStoreOutput
			{
			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,
			};

			//action.LocaleMsg = Biz.L($"扫描条码[{0}]上架到储位[{1}]成功");
			action.LocaleMsg = Biz.L("WMS.Default.ScanItem.PutOnSucceeded", CurInvItem.SN, CurInvItem.Location.LOCATION_CODE);

			//重置扫码信息
			ResetScanInfo();
			return SetOutPutMqttMsg(action, locale);
			}

			#endregion

			/// <summary>
			/// 重置当前操作，有需要则重写此方法
			/// 重置事务数据，有需要则重写此方法
			/// </summary>
			public override void ResetInfo()
			public override void ResetTrans()
			{
			base.ResetInfo();
			base.ResetTrans();
			ResetScanInfo();
			CurScanShelf = null;
			}

			/// <summary>
			/// 重置扫码信息
			/// </summary>
			public void ResetScanInfo()
			{
			Command = null;
			CurInvItem = null;
			CurScanShelf = null;
			}

			public override bool Close(bool needSaveHistoryLog = false)