物流更新

blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/IOrderBoxServiceImpl.java

@@ -947,7 +947,7 @@ public class IOrderBoxServiceImpl implements IOrderBoxService {
      * 校验订单是否已绑定
      * <p>避免同一订单被重复绑定到不同箱条码</p>
      *
-     * @param cardNo 订单ID列表
+     * @param cardNoList 订单ID列表
      * @return R<?> 校验结果
      */
     private R<?> checkOrderIdBoundStatus(List<String> cardNoList) {
@@ -1452,7 +1452,7 @@ public class IOrderBoxServiceImpl implements IOrderBoxService {
                     List<CenterTeam> list = iCenterTeamService.list(new LambdaQueryWrapper<CenterTeam>()
                             .select(CenterTeam::getWcId, CenterTeam::getTsId)
                             .eq(workPlan.getSubsidiaryTeam()!=null&&!workPlan.getSubsidiaryTeam().equals(""),CenterTeam::getTsId, (workPlan.getMakeTeam()))
-                            .eq(workPlan==null||workPlan.getSubsidiaryTeam().equals(""),CenterTeam::getTsId, (workPlan.getMakeTeam())));
+                            .eq(workPlan.getSubsidiaryTeam()==null||workPlan.getSubsidiaryTeam().equals(""),CenterTeam::getTsId, (workPlan.getMakeTeam())));
                     if (list == null || list.size() == 0) {
                         return R.fail(orderCardNo + "车间订单班次查询作业中心异常");
                     } else {
@@ -1475,7 +1475,7 @@ public class IOrderBoxServiceImpl implements IOrderBoxService {
                     List<CenterTeam> list = iCenterTeamService.list(new LambdaQueryWrapper<CenterTeam>()
                             .select(CenterTeam::getWcId, CenterTeam::getTsId)
                             .eq(workPlan.getSubsidiaryTeam()!=null&&!workPlan.getSubsidiaryTeam().equals(""),CenterTeam::getTsId, (workPlan.getMakeTeam()))
-                            .eq(workPlan==null||workPlan.getSubsidiaryTeam().equals(""),CenterTeam::getTsId, (workPlan.getMakeTeam())));
+                            .eq(workPlan.getSubsidiaryTeam()==null||workPlan.getSubsidiaryTeam().equals(""),CenterTeam::getTsId, (workPlan.getMakeTeam())));
                     if (list == null || list.size() == 0) {
                         return R.fail(orderCardNo + "车间订单班次查询作业中心异常");
                     } else {