生产订单添加字段

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/YieldOrder.java

@@ -497,6 +497,15 @@ public class YieldOrder extends BaseEntity {
 	@TableField(value = "parent_yo_id")
 	private Long parentYoId;
 
+	@Schema(description = "涂色标个数")
+	private String tsbNum;
+	@Schema(description = "涂色带个数")
+	private String tsdNum;
+	@Schema(description = "涂箭头个数")
+	private String tjtNum;
+	@Schema(description = "责任部门")
+	private String resDept;
+
 	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Double plateThickness1;
 

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

@@ -369,4 +369,13 @@ public class YieldOrderEntity extends TenantEntity {
 	@TableField(value = "ACTUAL_WEIGHING")
 	private BigDecimal actualWeighing;
 
+	@Schema(description = "涂色标个数")
+	private String tsbNum;
+	@Schema(description = "涂色带个数")
+	private String tsdNum;
+	@Schema(description = "涂箭头个数")
+	private String tjtNum;
+	@Schema(description = "责任部门")
+	private String resDept;
+
 }

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

@@ -563,6 +563,8 @@ public class PdaSaveServiceImpl extends BaseServiceImpl<WorkPlanMapper, WorkPlan
         yieldOrder.setCardNo(yieldOrderService.nextCardNo());
         yieldOrder.setYoCode(yieldOrderService.nextCode(rr.getRedono()));
         yieldOrder.setYpCode(rr.getRedono());
+        // todo责任部门从erp获取
+        yieldOrder.setResDept("");
         yieldOrder.setPartCode(part.getPartCode());
         yieldOrder.setProductType(part.getProductType());
         yieldOrder.setPartName(part.getPartName());
@@ -584,6 +586,7 @@ public class PdaSaveServiceImpl extends BaseServiceImpl<WorkPlanMapper, WorkPlan
         yieldOrder.setSiteWork(Boolean.FALSE);
         yieldOrder.setPrimaryCraft(rr.getDeptcode());
         yieldOrder.setStatus(YieldOrderEnum.STATUS_APS.getCode());
+        yieldOrder.setReceiveStatus(YieldOrderEnum.RECEIVE_STATUS_YES.getCode());
         List<User> users = userClient.listByNameNolike(rr.getRecman());
         yieldOrder.setReceiveUser(CollectionUtils.isNotEmpty(users) ? users.get(0).getId() : AuthUtil.getUserId());
         yieldOrder.setReceiveTime(new Date());

blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpDataProduceMapper.xml

@@ -105,18 +105,18 @@
         </where>
     </select>
     <select id="reviewFormMess" resultType="org.springblade.erpdata.pojo.vo.PpmReportDetailModelVO">
-        select a.code,
+        select a.code as sheetNo,
                a.p5layer1,
                a.p5layer3,
-               a.useproc,
-               a.useseq,
+               a.useproc as process,
+               a.useseq as processName,
                a.precode,
-               a.redodeptcode,
-               a.p1remark,
-               a.disposename,
+               a.redodeptcode as reworkLine,
+               a.p1remark as memo,
+               a.disposename as dispose,
                a.deptcode,
-               a.p2layer1,
-               a.chker,
+               a.p2layer1 as layer1,
+               a.chker as usercode,
                a.prtno,
                a.lotno
         from dba_mgr.v_mes_rb_qisbillqry a