From 8a09a1fabfa8840288c10f6c58ff4a6d519e66d7 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期五, 21 二月 2025 15:43:23 +0800
Subject: [PATCH] 雅达-更新条码生成逻辑，注释多处代码块
---
Tiger.Business.MES/iERP/MES_U9C.cs | 2
Tiger.IBusiness.WMS/Transaction/IPrintSemiProdLabel.cs | 2
Tiger.Business.WMS/Transaction/ReprintLabel.cs | 80 ++++++++++++++++++++--------------------
Tiger.Business.WMS/Transaction/In_Default.cs | 1
Tiger.Model.Net/Entitys/MES/ParameterEntity/U9CParameter.cs | 1
Tiger.Business.WMS/Transaction/PrintSemiProdLabel.cs | 31 ---------------
6 files changed, 44 insertions(+), 73 deletions(-)
diff --git a/Tiger.Business.MES/iERP/MES_U9C.cs b/Tiger.Business.MES/iERP/MES_U9C.cs
index 608f3cc..e3ce128 100644
--- a/Tiger.Business.MES/iERP/MES_U9C.cs
+++ b/Tiger.Business.MES/iERP/MES_U9C.cs
@@ -279,7 +279,7 @@
CreateBarCodeEntitys = new(){
new CreateBarCodeEntitys
{
- EntityID = input.RevDocId, //鍏ュ簱鍗旾D
+ EntityID = input.RevDocLineId, //鍏ュ簱鍗旾D
EntityType="UFIDA.U9.Complete.RCVRpt.RcvRptDocLine"
}
},
diff --git a/Tiger.Business.WMS/Transaction/In_Default.cs b/Tiger.Business.WMS/Transaction/In_Default.cs
index 5a10dca..559029c 100644
--- a/Tiger.Business.WMS/Transaction/In_Default.cs
+++ b/Tiger.Business.WMS/Transaction/In_Default.cs
@@ -162,6 +162,7 @@
inv.Items.Add(Item);
inv.History.Add(his);
inv.Packages.Add(ItemPkgs);
+ _inv = inv.Clone();
}
else if (inv.Items.Count == 1)
{
diff --git a/Tiger.Business.WMS/Transaction/PrintSemiProdLabel.cs b/Tiger.Business.WMS/Transaction/PrintSemiProdLabel.cs
index ff8fd30..1ae0373 100644
--- a/Tiger.Business.WMS/Transaction/PrintSemiProdLabel.cs
+++ b/Tiger.Business.WMS/Transaction/PrintSemiProdLabel.cs
@@ -92,37 +92,6 @@
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<PrintSemiProdLabelEntity>() ?? new PrintSemiProdLabelEntity();
- 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
- {
-
- 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)
diff --git a/Tiger.Business.WMS/Transaction/ReprintLabel.cs b/Tiger.Business.WMS/Transaction/ReprintLabel.cs
index d87b28a..45eb8c4 100644
--- a/Tiger.Business.WMS/Transaction/ReprintLabel.cs
+++ b/Tiger.Business.WMS/Transaction/ReprintLabel.cs
@@ -150,11 +150,11 @@
}
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).Sum(x=>x.QTY)>= rePrints.BatchQty)) {
- action.IsSuccessed = false;
- action.LocaleMsg = Biz.L($"姝ゅ簱浣峓{LocationCode}]涓婄殑鎵规[{rePrints.BatchNo}]鏁伴噺宸茬粡澶熸暟锛屼笉鑳藉啀涓婃灦鐢熸垚鏍囩");
- return action;
- }
+ //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() ?? "";
@@ -289,43 +289,43 @@
//}
//鎵ц涓婃灦
- 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);
+ //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;
- }
+ //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("搴撲綅鎵规鏉＄爜涓婃灦鎴愬姛");
diff --git a/Tiger.IBusiness.WMS/Transaction/IPrintSemiProdLabel.cs b/Tiger.IBusiness.WMS/Transaction/IPrintSemiProdLabel.cs
index 3e37c12..51d120b 100644
--- a/Tiger.IBusiness.WMS/Transaction/IPrintSemiProdLabel.cs
+++ b/Tiger.IBusiness.WMS/Transaction/IPrintSemiProdLabel.cs
@@ -15,7 +15,7 @@
{
public IPrintSemiProdLabel Init(string id, string userCode, string apiHost, string orgCode);
public Task<ApiAction<ScanOutput>> Scan(BaseInput input);
- public Task<ApiAction<ScanOutput>> ScanItem(BaseInput input);
+ //public Task<ApiAction<ScanOutput>> ScanItem(BaseInput input);
public bool Close(bool needSaveHistoryLog = false);
diff --git a/Tiger.Model.Net/Entitys/MES/ParameterEntity/U9CParameter.cs b/Tiger.Model.Net/Entitys/MES/ParameterEntity/U9CParameter.cs
index 9525622..1e6c2af 100644
--- a/Tiger.Model.Net/Entitys/MES/ParameterEntity/U9CParameter.cs
+++ b/Tiger.Model.Net/Entitys/MES/ParameterEntity/U9CParameter.cs
@@ -100,6 +100,7 @@
public class BarcodeCreateInput
{
public string RevDocId { get; set; }
+ public string RevDocLineId { get; set; }
public string userId { get; set; }
public string token { get; set; }
public bool IsLogin { get; set; }
--
Gitblit v1.9.3