生产管理修改

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

@@ -19,6 +19,9 @@ public class ProduceMonitorPlanDataVO {
 	@Schema(description = "接收数量")
 	private Double qualifiedQty;
 
+	@Schema(description = "接收人")
+	private String receiveName;
+
 	@Schema(description = "试验数量")
 	private Double testQty;
 

blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/YieldOrderEntity.java

@@ -176,7 +176,7 @@ public class YieldOrderEntity extends TenantEntity {
 	 * 优先级-erp中订单优先级
 	 */
 	@TableField(value = "PRIORITY_ERP")
-	private Long priorityErp;
+	private Integer priorityErp;
 
 	/**
 	 * 保管员

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

@@ -1393,7 +1393,8 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
         // 工序信息
         WorkPlan workPlan = workPlanService.getById(wpId);
         BeanUtils.copyProperties(workPlan, planDataVO);
-
+        User receiveMan = UserCache.getUser(workPlan.getReceiveMan());
+        planDataVO.setReceiveName(receiveMan != null ? receiveMan.getRealName() : "");
         // 加工记录
         List<MakeRec> makeRecs = makeRecService.list(Wrappers.lambdaQuery(MakeRec.class).eq(MakeRec::getWpId, wpId));
         if (CollectionUtils.isNotEmpty(makeRecs)) {
@@ -1688,6 +1689,9 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
             inspectionTask.setWpId(workPlan.getId());
             inspectionTask.setCheckUserId(userId);
             inspectionTask.setCheckDate(LocalDateTime.now());
+            inspectionTask.setScrapQty(0d);
+            inspectionTask.setCheckQty(0d);
+            inspectionTask.setLossQty(0d);
             inspectionTaskMapper.insertOrUpdate(inspectionTask);
 
             // 保存检验项目

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

@@ -895,7 +895,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                         workOrder.setRunStatus(2);
                         workOrder.setPickingStatus(0);
                         workOrder.setOem("0");
-                        workOrder.setPriority(order.getPriorityAps());
+                        workOrder.setPriority(order.getPriorityErp());
                         workOrder.setApprovalStatus(1);
                         workOrder.setScrapQty(0);
                         workOrder.setOemOut("0");
@@ -906,6 +906,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                         workOrder.setReInStore("0");
                         workOrder.setPartCode(order.getPartCode());
                         workOrder.setDemandDate(order.getDemandDate());
+                        workOrder.setSendDownTime(new Date());
                         //调度员是主工序加工班组的调度员
                         if (workPlanList.get(0).getMakeTeam() != null) {
                             TeamSetEntity teamSet = teamSetService.getById(workPlanList.get(0).getMakeTeam());