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

ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs

@@ -2074,7 +2074,7 @@ namespace Tnb.ProductionMgr
                 {
                     throw Oops.Bah($"提报失败，载具已绑定");
                 }
-                List<WmsCarryCode> wmsCarryCodes = await db.Queryable<WmsCarryCode>().Where(x=>x.carry_code==materialBoxCode).ToListAsync();
+                List<WmsCarryCode> wmsCarryCodes = await db.Queryable<WmsCarryCode>().Where(x=>x.carry_id==wmsCarryH.id).ToListAsync();
                 if (wmsCarryCodes != null && wmsCarryCodes.Count > 0)
                 {
                     Log.Error($"载具{materialBoxCode}状态为{wmsCarryH.carry_status},但有条码{JsonConvert.SerializeObject(wmsCarryCodes)}");