aps-订单评审增加字段 内部客户iD、名称 报工记录增加字段和赋值 注意事项

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsReportRecordsServiceImpl.java

@@ -220,11 +220,11 @@ public class ApsReportRecordsServiceImpl extends ServiceImpl<ApsReportRecordsDao
 //                        .isNotNull(ApsProcessOperationProcessEquDo::getWaitreportid)//待报工记录ID不为空
 //        );
         //存在已使用,判断是否是合并作业 （计划开工时间相同）
-        if(ObjectUtil.isNotEmpty(list)){
+        if (ObjectUtil.isNotEmpty(list)) {
             //已开工的作业明细的计划开工时间
             Date planstartdate = list.get(0).getPlanstartdate();
             //开工时间不用
-            if(planstartdate.compareTo(apsProcessOperationProcessEquDo.getPlanstartdate()) != 0){
+            if (planstartdate.compareTo(apsProcessOperationProcessEquDo.getPlanstartdate()) != 0) {
                 return R.error("该设备当前加工中的作业还未报工，不能开工新的作业");
             }
         }
@@ -290,6 +290,8 @@ public class ApsReportRecordsServiceImpl extends ServiceImpl<ApsReportRecordsDao
         apsReportRecordsDo.setCheckstatus("待检验");
         //设备参数
         apsReportRecordsDo.setDeviceparm(equparames);
+        //注意事项
+        apsReportRecordsDo.setAttention(apsProcessOperationDo.getRemark());
 
         //保存主表
         this.save(apsReportRecordsDo);

cx-aps/cx-aps-entity/src/main/java/com/rongwei/bsentity/domain/ApsProductionOrderDo.java

@@ -617,6 +617,16 @@ public class ApsProductionOrderDo extends BaseDo implements Serializable {
      */
     private String processstatustext;
 
+    /**
+     * 内部客户ID
+     */
+    private String internalcustomerid;
+
+    /**
+     * 内部客户名称
+     */
+    private String internalcustomername;
+
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
 }

cx-aps/cx-aps-entity/src/main/java/com/rongwei/bsentity/domain/ApsReportRecordsDo.java

@@ -123,6 +123,11 @@ public class ApsReportRecordsDo extends BaseDo implements Serializable {
      */
     private String deviceparm;
 
+    /**
+     * 注意事项
+     */
+    private String attention;
+
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
 }