From a544d13081b01f68824e80500c7c30ab2680d524 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周五, 10 10月 2025 16:08:03 +0800
Subject: [PATCH] //修复bug：查询出入库单据信息 【Editby shaocx,2025-09-29】 -- 这个功能没测试过，不一定好使啊啊啊啊啊！！！！！
---
DEmon/iWareCc/CreateOutMainTask/chain/生成出库主任务.cs | 35 ++++++++++-------
DEmon/iWareCc/CreateOutMainTask/chain/保存生成的出库任务.cs | 10 +++-
DEmon/iWareCc/CreateMainTask/chain/保存生成的入库任务.cs | 12 ++++--
DEmon/iWareCc/CreateMainTask/chain/根据扫码生成入库主任务.cs | 14 ++++--
4 files changed, 44 insertions(+), 27 deletions(-)
diff --git "a/DEmon/iWareCc/CreateMainTask/chain/\344\277\235\345\255\230\347\224\237\346\210\220\347\232\204\345\205\245\345\272\223\344\273\273\345\212\241.cs" "b/DEmon/iWareCc/CreateMainTask/chain/\344\277\235\345\255\230\347\224\237\346\210\220\347\232\204\345\205\245\345\272\223\344\273\273\345\212\241.cs"
index 3cb1095..281b095 100644
--- "a/DEmon/iWareCc/CreateMainTask/chain/\344\277\235\345\255\230\347\224\237\346\210\220\347\232\204\345\205\245\345\272\223\344\273\273\345\212\241.cs"
+++ "b/DEmon/iWareCc/CreateMainTask/chain/\344\277\235\345\255\230\347\224\237\346\210\220\347\232\204\345\205\245\345\272\223\344\273\273\345\212\241.cs"
@@ -12,7 +12,7 @@
namespace iWareCc.CreateMainTask.chain
{
- public class 淇濆瓨鐢熸垚鐨勫叆搴撲换鍔�: IHandler
+ public class 淇濆瓨鐢熸垚鐨勫叆搴撲换鍔� : IHandler
{
/// <summary>
/// 璇ヨ妭鐐圭殑涓嬩竴涓妭鐐�
@@ -23,7 +23,7 @@
set { nextHandler = value; }
}
- private ConveyorEntity Conveyor;
+ private ConveyorEntity Conveyor;
private MainTaskContainer MainTaskContainer;
@@ -46,8 +46,12 @@
try
{
var task = MainTaskContainer.MainTask;
- var mater = dbModel.BASEMaterials.FirstOrDefault(x=>x.code==task.MaterialCode);
- var inoutlistdetail = dbModel.BASEInOutListDetails.FirstOrDefault(x => x.materialid == mater.id);
+ var mater = dbModel.BASEMaterials.FirstOrDefault(x => x.code == task.MaterialCode);
+
+ //淇bug锛氭煡璇㈠嚭鍏ュ簱鍗曟嵁淇℃伅 銆怑ditby shaocx,2025-09-29銆�
+ //var inoutlistdetail = dbModel.BASEInOutListDetails.FirstOrDefault(x => x.materialid == mater.id);
+ var inoutlistdetail = dbModel.BASEInOutListDetails.FirstOrDefault(x => x.id == task.InOutListDetailId);
+
inoutlistdetail.isfinish = 1;
dbModel.TASKMainTasks.Add(task.ToOrm());
diff --git "a/DEmon/iWareCc/CreateMainTask/chain/\346\240\271\346\215\256\346\211\253\347\240\201\347\224\237\346\210\220\345\205\245\345\272\223\344\270\273\344\273\273\345\212\241.cs" "b/DEmon/iWareCc/CreateMainTask/chain/\346\240\271\346\215\256\346\211\253\347\240\201\347\224\237\346\210\220\345\205\245\345\272\223\344\270\273\344\273\273\345\212\241.cs"
index c17f5e8..518f61f 100644
--- "a/DEmon/iWareCc/CreateMainTask/chain/\346\240\271\346\215\256\346\211\253\347\240\201\347\224\237\346\210\220\345\205\245\345\272\223\344\270\273\344\273\273\345\212\241.cs"
+++ "b/DEmon/iWareCc/CreateMainTask/chain/\346\240\271\346\215\256\346\211\253\347\240\201\347\224\237\346\210\220\345\205\245\345\272\223\344\270\273\344\273\273\345\212\241.cs"
@@ -17,7 +17,7 @@
namespace iWareCc.CreateMainTask.chain
{
- public class 鏍规嵁鎵爜鐢熸垚鍏ュ簱涓讳换鍔�: IHandler
+ public class 鏍规嵁鎵爜鐢熸垚鍏ュ簱涓讳换鍔� : IHandler
{
/// <summary>
/// 璇ヨ妭鐐圭殑涓嬩竴涓妭鐐�
@@ -62,7 +62,7 @@
var placematerial = dbModel.BASEPlaceMaterialViews.FirstOrDefault(x => x.materialcode == sc.RCheckMaterialCode.Trim());
if (placematerial != null)
{
-
+
// alarm.SendGateAlarmTask((int)ESendCode.宸插湪绔嬪簱涓笉鑳藉叆搴�);
LogTextHelper.WriteLine(Resources.LogDir + @"/鑷姩鐢熸垚鍏ュ簱涓讳换鍔℃祦绋�", "鐗╂枡鍙凤細{0}", sc.RCheckMaterialCode + "宸插湪绔嬪簱涓�");
sc.RCheckMaterialCode = "";
@@ -82,7 +82,7 @@
return;
}
- var task = dbModel.TASKMainTasks.FirstOrDefault(x => x.materialcode == sc.RCheckMaterialCode.Trim() && x.tasktype == (int)EMainTaskType.鍏ュ簱浠诲姟&&x.status==0);
+ var task = dbModel.TASKMainTasks.FirstOrDefault(x => x.materialcode == sc.RCheckMaterialCode.Trim() && x.tasktype == (int)EMainTaskType.鍏ュ簱浠诲姟 && x.status == 0);
if (task != null)
{
//alarm.SendGateAlarmTask((int)ESendCode.宸插瓨鍦ㄨ浠诲姟);
@@ -117,6 +117,10 @@
islots = 0,
priority = 0,
+ //璧嬪�� 銆怑ditby shaocx,2025-09-29銆�
+ InOutListDetailId = inoutlistdetail.id,
+ //ListNo = inoutlistdetail.listno,
+
};
MainTaskContainer.MainTask = new MainTaskEntity(matask);
}
@@ -133,12 +137,12 @@
nextHandler.Handle();
}
}
- else
+ else
{
LogTextHelper.WriteLine(Resources.LogDir + @"/鑷姩鐢熸垚鍏ュ簱涓讳换鍔℃祦绋�", "鏈娴嬪埌鏈夋壂鐮佷俊鎭�");
return;
}
-
+
}
catch (Exception ex)
{
diff --git "a/DEmon/iWareCc/CreateOutMainTask/chain/\344\277\235\345\255\230\347\224\237\346\210\220\347\232\204\345\207\272\345\272\223\344\273\273\345\212\241.cs" "b/DEmon/iWareCc/CreateOutMainTask/chain/\344\277\235\345\255\230\347\224\237\346\210\220\347\232\204\345\207\272\345\272\223\344\273\273\345\212\241.cs"
index d2e8bbe..a814910 100644
--- "a/DEmon/iWareCc/CreateOutMainTask/chain/\344\277\235\345\255\230\347\224\237\346\210\220\347\232\204\345\207\272\345\272\223\344\273\273\345\212\241.cs"
+++ "b/DEmon/iWareCc/CreateOutMainTask/chain/\344\277\235\345\255\230\347\224\237\346\210\220\347\232\204\345\207\272\345\272\223\344\273\273\345\212\241.cs"
@@ -11,7 +11,7 @@
namespace iWareCc.CreateOutMainTask.chain
{
- public class 淇濆瓨鐢熸垚鐨勫嚭搴撲换鍔� : IHandler
+ public class 淇濆瓨鐢熸垚鐨勫嚭搴撲换鍔� : IHandler
{
/// <summary>
/// 璇ヨ妭鐐圭殑涓嬩竴涓妭鐐�
@@ -29,7 +29,7 @@
/// </summary>
/// <param name="resultContainer">缁撴灉瀹瑰櫒</param>
/// <param name="decompositionTaskContainer">WIP浠诲姟瀹瑰櫒</param>
- public 淇濆瓨鐢熸垚鐨勫嚭搴撲换鍔�( MainTaskContainer decompositionTaskContainer)
+ public 淇濆瓨鐢熸垚鐨勫嚭搴撲换鍔�(MainTaskContainer decompositionTaskContainer)
{
this.MainTaskContainer = decompositionTaskContainer;
}
@@ -43,7 +43,11 @@
{
var task = MainTaskContainer.MainTask;
var mater = dbModel.BASEMaterials.FirstOrDefault(x => x.code == task.MaterialCode);
- var inoutlistdetail = dbModel.BASEInOutListDetails.FirstOrDefault(x => x.materialid == mater.id);
+
+ //淇bug锛氭煡璇㈠嚭鍏ュ簱鍗曟嵁淇℃伅 銆怑ditby shaocx,2025-09-29銆�
+ //var inoutlistdetail = dbModel.BASEInOutListDetails.FirstOrDefault(x => x.materialid == mater.id);
+ var inoutlistdetail = dbModel.BASEInOutListDetails.FirstOrDefault(x => x.id == task.InOutListDetailId);
+
inoutlistdetail.isfinish = 1;
dbModel.TASKMainTasks.Add(task.ToOrm());
diff --git "a/DEmon/iWareCc/CreateOutMainTask/chain/\347\224\237\346\210\220\345\207\272\345\272\223\344\270\273\344\273\273\345\212\241.cs" "b/DEmon/iWareCc/CreateOutMainTask/chain/\347\224\237\346\210\220\345\207\272\345\272\223\344\270\273\344\273\273\345\212\241.cs"
index ae80068..70d483a 100644
--- "a/DEmon/iWareCc/CreateOutMainTask/chain/\347\224\237\346\210\220\345\207\272\345\272\223\344\270\273\344\273\273\345\212\241.cs"
+++ "b/DEmon/iWareCc/CreateOutMainTask/chain/\347\224\237\346\210\220\345\207\272\345\272\223\344\270\273\344\273\273\345\212\241.cs"
@@ -15,7 +15,7 @@
namespace iWareCc.CreateOutMainTask.chain
{
- public class 鐢熸垚鍑哄簱涓讳换鍔�: IHandler
+ public class 鐢熸垚鍑哄簱涓讳换鍔� : IHandler
{
/// <summary>
/// 璇ヨ妭鐐圭殑涓嬩竴涓妭鐐�
@@ -33,7 +33,7 @@
/// </summary>
/// <param name="resultContainer">缁撴灉瀹瑰櫒</param>
/// <param name="decompositionTaskContainer">WIP浠诲姟瀹瑰櫒</param>
- public 鐢熸垚鍑哄簱涓讳换鍔�( MainTaskContainer mainTaskContainer)
+ public 鐢熸垚鍑哄簱涓讳换鍔�(MainTaskContainer mainTaskContainer)
{
this.MainTaskContainer = mainTaskContainer;
}
@@ -47,8 +47,8 @@
try
{
-
- var inoutlistdetail = dbModel.BASEInOutListDetailViews.FirstOrDefault(x =>x.isfinish== 0&&x.typename=="鍑哄簱");
+
+ var inoutlistdetail = dbModel.BASEInOutListDetailViews.FirstOrDefault(x => x.isfinish == 0 && x.typename == "鍑哄簱");
if (inoutlistdetail == null)
{
@@ -58,24 +58,24 @@
string materialcode = inoutlistdetail.materialcode;
var placematerial = dbModel.BASEPlaceMaterialViews.FirstOrDefault(x => x.materialcode == materialcode);
if (placematerial == null)
- {
- inoutlistdetail.isfinish = 1;
- dbModel.SaveChanges();
- // alarm.SendGateAlarmTask((int)ESendCode.宸插湪绔嬪簱涓笉鑳藉叆搴�);
- LogTextHelper.WriteLine(Resources.LogDir + @"/鑷姩鐢熸垚鍑哄簱涓讳换鍔℃祦绋�", "鐗╂枡鍙凤細{0}", materialcode + "涓嶅湪绔嬪簱涓�");
+ {
+ inoutlistdetail.isfinish = 1;
+ dbModel.SaveChanges();
+ // alarm.SendGateAlarmTask((int)ESendCode.宸插湪绔嬪簱涓笉鑳藉叆搴�);
+ LogTextHelper.WriteLine(Resources.LogDir + @"/鑷姩鐢熸垚鍑哄簱涓讳换鍔℃祦绋�", "鐗╂枡鍙凤細{0}", materialcode + "涓嶅湪绔嬪簱涓�");
return;
- }
+ }
var tasknew = dbModel.TASKPartTasks.FirstOrDefault(x => x.type == (int)EPartTaskType.杈撻�佹満浠诲姟 && x.isreleased == (int)EYesOrNo.鍚� && x.isfinished == (int)EYesOrNo.鍚� && x.materialcode == materialcode && x.maintasktype == (int)EMainTaskType.鍑哄簱浠诲姟);
if (tasknew != null)
{
LogTextHelper.WriteLine(Resources.LogDir + @"/鑷姩鐢熸垚鍑哄簱涓讳换鍔℃祦绋�", "鐗╂枡鍙凤細{0}", materialcode + "宸插湪瑕佹墽琛岀殑浠诲姟搴忓垪涓�");
- return;
+ return;
}
- var task = dbModel.TASKMainTasks.FirstOrDefault(x => x.materialcode == materialcode && x.tasktype == (int)EMainTaskType.鍑哄簱浠诲姟&&x.status == 0);
+ var task = dbModel.TASKMainTasks.FirstOrDefault(x => x.materialcode == materialcode && x.tasktype == (int)EMainTaskType.鍑哄簱浠诲姟 && x.status == 0);
if (task != null)
{
- LogTextHelper.WriteLine(Resources.LogDir + @"/鑷姩鐢熸垚鍑哄簱涓讳换鍔℃祦绋�", "鐗╂枡鍙凤細{0}", "璇ヤ换鍔″凡瀛樺湪");
- return;
+ LogTextHelper.WriteLine(Resources.LogDir + @"/鑷姩鐢熸垚鍑哄簱涓讳换鍔℃祦绋�", "鐗╂枡鍙凤細{0}", "璇ヤ换鍔″凡瀛樺湪");
+ return;
}
TASKMainTask matask = new TASKMainTask()
{
@@ -95,9 +95,14 @@
decompositiontimes = 0,
islots = 0,
priority = 0,
+
+
+ //璧嬪�� 銆怑ditby shaocx,2025-09-29銆�
+ InOutListDetailId = inoutlistdetail.id,
+ ListNo = inoutlistdetail.listno,
};
MainTaskContainer.MainTask = new MainTaskEntity(matask);
-
+
if (nextHandler != null)
{
nextHandler.Handle();
--
Gitblit v1.9.3