From fb9ba4b7a86d57616ebaa80d7e9b043ecf59d41f Mon Sep 17 00:00:00 2001
From: zhou keda <1315948824@qq.com>
Date: Thu, 27 Jun 2024 09:10:31 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=89=A9=E6=96=99=E7=AD=BE=E6=94=B6bug?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Tnb.ProductionMgr/PrdFeedingService.cs    | 21 +++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/ProductionMgr/Tnb.ProductionMgr/PrdFeedingService.cs b/ProductionMgr/Tnb.ProductionMgr/PrdFeedingService.cs
index 7f04e793..fb929ec1 100644
--- a/ProductionMgr/Tnb.ProductionMgr/PrdFeedingService.cs
+++ b/ProductionMgr/Tnb.ProductionMgr/PrdFeedingService.cs
@@ -422,6 +422,22 @@ namespace Tnb.ProductionMgr
                             status = "0",
                             use_num = 0,
                         });
+                        
+                        Tnb.WarehouseMgr.Entities.Dto.Outputs.Result result = await _wmsCarryBindService.CarryUnbind(new CarryBindInput()
+                        {
+                            org = prdFeedingH.org_id,
+                            create_id = prdFeedingH.create_id,
+                            carry_id = prdFeedingH.carry_id,
+                            carry_code = prdFeedingH.carry_code,
+                            carrystd_id = carry.carrystd_id,
+                            membercarry_code = detail.member_carry_code,
+                            membercarry_id = detail.member_carry_id,
+                        });
+
+                        if (result.code != JNPF.Common.Enums.HttpStatusCode.OK)
+                        {
+                            throw Oops.Bah(result.msg);
+                        }
 
                         if (detail != null)
                         {
@@ -447,6 +463,7 @@ namespace Tnb.ProductionMgr
                         {
                             throw new Exception("没有签收单，无法投料");
                         }
+                        
                     }
                 }
                 else
@@ -457,10 +474,6 @@ namespace Tnb.ProductionMgr
 
                 _ = await db.Insertable<PrdFeedingH>(prdFeedingH).ExecuteCommandAsync();
                 _ = await db.Insertable<PrdFeedingD>(list).ExecuteCommandAsync();
-                _wmsCarryBindService.CarryCodeUnbind(new CarryCodeUnbindInput()
-                {
-                    carry_id = carry.id
-                });
 
             });
 

From bccf2bca5a3a43cf0825e8c1009bc47fffe0ae81 Mon Sep 17 00:00:00 2001
From: zhou keda <1315948824@qq.com>
Date: Thu, 27 Jun 2024 11:01:23 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=B3=A8=E5=A1=91=E5=AE=9A=E7=82=B9?=
 =?UTF-8?q?=E9=85=8D=E9=80=81=E5=B7=B2=E4=B8=8B=E5=8F=91=E4=B9=9F=E4=B8=8D?=
 =?UTF-8?q?=E5=8F=91=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ProductionMgr/Tnb.ProductionMgr/TimeWorkService.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ProductionMgr/Tnb.ProductionMgr/TimeWorkService.cs b/ProductionMgr/Tnb.ProductionMgr/TimeWorkService.cs
index bfda06a3..3e8e92e4 100644
--- a/ProductionMgr/Tnb.ProductionMgr/TimeWorkService.cs
+++ b/ProductionMgr/Tnb.ProductionMgr/TimeWorkService.cs
@@ -290,7 +290,9 @@ namespace Tnb.ProductionMgr
                 if (await _db.Queryable<WmsPretaskH>().AnyAsync(x =>
                         x.endlocation_id == equipment.upmat_location_id &&
                         x.biz_type == WmsWareHouseConst.BIZTYPE_WMSDELIVERY_ID &&
-                        x.status == WmsWareHouseConst.PRETASK_BILL_STATUS_DXF_ID))
+                        (x.status == WmsWareHouseConst.PRETASK_BILL_STATUS_DXF_ID 
+                         || x.status == WmsWareHouseConst.PRETASK_BILL_STATUS_YXF_ID)
+                        ))
                 {
                     Log.Error($"{equipment.name}存在待下发的任务");
                     continue;