Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev

Conflicts:
	ProductionMgr/Tnb.ProductionMgr/PrdFeedingService.cs

ProductionMgr/Tnb.ProductionMgr/PrdFeedingService.cs

@@ -426,6 +426,22 @@ namespace Tnb.ProductionMgr
                             status = "0",
                             use_num = 0,
                         });
+                        
+                        Tnb.WarehouseMgr.Entities.Dto.Outputs.Result result = await _wmsCarryUnbindService.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)
                         {
@@ -451,6 +467,7 @@ namespace Tnb.ProductionMgr
                         {
                             throw new Exception("没有签收单，无法投料");
                         }
+                        
                     }
                 }
                 else

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;