生产管理修改

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/WorkOrderVO.java

@@ -80,25 +80,25 @@ public class WorkOrderVO extends WorkOrder {
 	private String dispatcherName;
 
 	@Schema(description = "未入库数量")
-	private Integer notInQty;
+	private Double notInQty;
 
 	@Schema(description = "下序id")
-	private Integer ppsIdNext;
+	private Long ppsIdNext;
 
 	@Schema(description = "下序名称")
-	private Integer ppsNameNext;
+	private String ppsNameNext;
 
 	@Schema(description = "下一班组id")
-	private Integer makeTeamNext;
+	private Long makeTeamNext;
 
 	@Schema(description = "下一班组")
-	private Integer makeTeamNextName;
+	private String makeTeamNextName;
 
 	@Schema(description = "接收人员id")
-	private Integer receiveUser;
+	private Long receiveUser;
 
 	@Schema(description = "接收人员")
-	private Integer receiveUserNamr;
+	private String receiveUserName;
 
 	@Schema(description = "状态")
 	private String runStatusName;

blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java

@@ -25,6 +25,7 @@ import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.desk.basic.constant.FlowConst;
 import org.springblade.desk.basic.pojo.entity.BsAssignEntity;
+import org.springblade.desk.basic.pojo.entity.CenterTeam;
 import org.springblade.desk.basic.pojo.entity.OemCraftAbilityEntity;
 import org.springblade.desk.basic.pojo.entity.WorkCenter;
 import org.springblade.desk.basic.service.*;
@@ -197,6 +198,8 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
 
     private final IBsSalaryStandardService bsSalaryStandardService;
 
+    private final ICenterTeamService centerTeamService;
+
     @Override
     public IPage<WorkOrderVO> selectWorkOrderPage(IPage<WorkOrderVO> page, WorkOrderDTO workOrder) {
         return page.setRecords(baseMapper.selectWorkOrderPage(page, workOrder));
@@ -1650,12 +1653,15 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
         if (workPlan.getMakeTeam() != null) {
             BsTeamSetEntity ct = teamSetService.getById(workPlan.getMakeTeam());
             if (ct != null) {
-                WorkCenter workCenter = workCenterService.getById(ct.getWcId());
-                if (1 == workCenter.getCheckout()) {
+                CenterTeam byTsId = centerTeamService.getByTsId(ct.getId());
+                if (byTsId != null) {
+                    WorkCenter workCenter = workCenterService.getById(byTsId.getWcId());
+                    if (workCenter != null && 1 == workCenter.getCheckout()) {
                         return;
                     }
                 }
             }
+        }
         if ("1".equals(frontWorkPlan.getOem()) && "1".equals(workPlan.getOem())) {
             return;
         }