Merge remote-tracking branch 'origin/mode-min-unit' into mode-min-unit

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

@@ -646,13 +646,19 @@ public class ApsReportRecordsServiceImpl extends ServiceImpl<ApsReportRecordsDao
         ApsProductionOrderDo apsProductionOrderDo = apsProductionOrderService.getById(apsBlankOrderDo.getProductionorderid());
 
         //=============更新作业明细信息=============
+        Integer reduceNum = 1;
+        if (ObjectUtil.isNotEmpty(nowReportRecordsDo.getBatchnumber())) {
+            List<String> batchNumberList = Arrays.asList(nowReportRecordsDo.getBatchnumber().split(","));
+            reduceNum = batchNumberList.size();
+        }
+
         //更新待报工记录ID、已报工卷数
         //已报工卷数
         Integer reportroll = apsProcessOperationProcessEquDo.getReportroll();
         ApsProcessOperationProcessEquDo needUpdateProcessOperationProcessEquDo = new ApsProcessOperationProcessEquDo();
         needUpdateProcessOperationProcessEquDo.setId(apsProcessOperationProcessEquDo.getId());
         //已报工卷数+1
-        needUpdateProcessOperationProcessEquDo.setReportroll(reportroll + 1);
+        needUpdateProcessOperationProcessEquDo.setReportroll(reportroll + reduceNum);
         /**
          * 更新作业明细的完工状态
          * 如果未完工卷数=0，或者工序作业已完工状态=已完工，则=已完工
@@ -685,7 +691,35 @@ public class ApsReportRecordsServiceImpl extends ServiceImpl<ApsReportRecordsDao
         apsProcessOperationProcessEquService.updateById(needUpdateProcessOperationProcessEquDo);
 
         //==============更新工序作业信息==============
-        this.baseMapper.updateProcessReportRoll(apsProcessOperationDo.getId());
+        ApsProcessOperationDo needUpdateProcessOperation = new ApsProcessOperationDo();
+        needUpdateProcessOperation.setId(apsProcessOperationDo.getId());
+        //已报工卷数=已报工卷数+输入批次号数量
+        needUpdateProcessOperation.setReportroll(apsProcessOperationDo.getReportroll() + reduceNum);
+        //未完工卷数=计划加工卷数-已报工卷数
+        needUpdateProcessOperation.setUnfinishroll(apsProcessOperationDo.getPlanprocessrall() - needUpdateProcessOperation.getReportroll());
+        //剩余待报工卷数=未完工卷数-输入已取消卷数-已取消卷数
+        int needReportRoll = needUpdateProcessOperation.getUnfinishroll() - apsProcessOperationDo.getInputunqualifiedroll() - apsProcessOperationDo.getCancelroll();
+        /**
+         * 如果剩余待报工卷数=0，则完工状态=已完工，实际完工时间=当前时间
+         * 如果剩余待报工卷数>0，则完工状态=未完工
+         * 如果完工状态=未完工，则作业状态=加工中；
+         * 如果完工状态=已完工，则作业状态=已完工
+         * 生产状态=作业状态
+         */
+        if (needReportRoll <= 0) {
+            needUpdateProcessOperation.setClosestatus("已完工");
+            needUpdateProcessOperation.setActualfinishdate(DateUtil.date());
+            needUpdateProcessOperation.setWorkstatus("已完工");
+            needUpdateProcessOperation.setProcessstatus(SaveConstans.ProductionStatus.COMPLETED);
+        }
+        if (needReportRoll > 0) {
+            needUpdateProcessOperation.setClosestatus("未完工");
+            needUpdateProcessOperation.setWorkstatus("加工中");
+            needUpdateProcessOperation.setProcessstatus(SaveConstans.ProductionStatus.PROCESSING);
+        }
+
+        apsProcessOperationService.updateById(needUpdateProcessOperation);
+//        this.baseMapper.updateProcessReportRoll(apsProcessOperationDo.getId());
 
 //        //=============更新设备的报工记录ID===========
 //        apsProcessOperationProcessEquDao.updateEquByCancelRecord(apsReportRecordsDo.getId(), apsProcessOperationProcessEquDo.getProcessdeviceid());

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

@@ -90,7 +90,7 @@ public class ApsProcessOperationDo extends BaseDo {
     @TableField("ONCEPROCESSVAL")
     private BigDecimal onceprocessval;
     /**
-     * 单次加工时长
+     * 单卷作业时长（分钟）
      */
     @TableField("ONCEPROCESSMIN")
     private BigDecimal onceprocessmin;
@@ -300,7 +300,7 @@ public class ApsProcessOperationDo extends BaseDo {
     @TableField("ACTUALIMPUTROLL")
     private Integer actualimputroll;
     /**
-     * 输入不合格卷数
+     * 输入已取消卷数
      */
     @TableField("INPUTUNQUALIFIEDROLL")
     private Integer inputunqualifiedroll;
@@ -309,11 +309,6 @@ public class ApsProcessOperationDo extends BaseDo {
      */
     @TableField("ACTUALCANPROCESSROLL")
     private Integer actualcanprocessroll;
-    /**
-     * 完工状态
-     */
-    @TableField("CLOSESTATUS")
-    private String closestatus;
     /**
      * 已借调卷数
      */
@@ -354,13 +349,18 @@ public class ApsProcessOperationDo extends BaseDo {
      */
     @TableField("PROCESSSTATUS")
     private String processstatus;
+    /**
+     * 完工状态
+     */
+    @TableField("CLOSESTATUS")
+    private String closestatus;
     /**
      * 待加工料卷批次号
      */
     @TableField("BACHMATERIALPROCESS")
     private String bachmaterialprocess;
     /**
-     * 计划作业时长
+     * 计划作业时长（分钟）
      */
     @TableField("PROCESSTOTALTIME")
     private BigDecimal processtotaltime;
@@ -456,6 +456,16 @@ public class ApsProcessOperationDo extends BaseDo {
      */
     @TableField("workspeed")
     private BigDecimal workspeed;
+    /**
+     * 剩余待报工卷数
+     */
+    @TableField("LEAVEWAITJOBROLL")
+    private Integer leavewaitjobroll;
+    /**
+     * 剩余待开工卷数
+     */
+    @TableField("LEAVEWAITWORKROLL")
+    private Integer leavewaitworkroll;
 
 
 }

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

@@ -264,24 +264,69 @@ public class ApsProcessOperationOutMaterDo extends BaseDo implements Serializabl
     private Integer goodrollnum;
 
     /**
-     * 横切分卷数
+     * 计划备料卷数
      */
-    private Integer crosscutnum;
+    private Integer planstockrollnum;
 
     /**
-     * 纵切分卷数
+     * 计划成品卷数
      */
-    private Integer ripcutnum;
+    private Integer planprodrollnum;
 
     /**
-     * 计划备料卷数
+     * 计划流转卷数
      */
-    private Integer planstockrollnum;
+    private Integer planmoverollnum;
 
     /**
-     * 计划成品卷数
+     * 成品已输出卷数
      */
-    private Integer planprodrollnum;
+    private Integer prodoutroll;
+
+    /**
+     * 流转已输出卷数
+     */
+    private Integer moveoutroll;
+
+    /**
+     * 备料已输出卷数
+     */
+    private Integer stockoutroll;
+
+    /**
+     * 输出已取消卷数
+     */
+    private Integer outcancelroll;
+
+    /**
+     * 成品已取消卷数
+     */
+    private Integer prodcancelroll;
+
+    /**
+     * 流转已取消卷数
+     */
+    private Integer movecancelroll;
+
+    /**
+     * 备料已取消卷数
+     */
+    private Integer stockcancelroll;
+
+    /**
+     * 成品剩余需输出卷数
+     */
+    private Integer prodleaveoutroll;
+
+    /**
+     * 流转剩余需输出卷数
+     */
+    private Integer moveleaveoutroll;
+
+    /**
+     * 备料剩余需输出卷数
+     */
+    private Integer stockleaveoutroll;
 
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;

cx-aps/cx-aps-server/src/main/java/com/rongwei/bsserver/controller/ApsReportRecordController.java

@@ -32,26 +32,24 @@ public class ApsReportRecordController {
     private ApsReportRecordsService apsReportRecordsService;
 
     /**
-     *  取消报工
+     * 取消报工
+     *
      * @param req
      * @return
      */
     @PostMapping("/cancelRecord")
     public R cancelRecord(@RequestBody Map<String, String> req) {
-        try {
-            log.info("取消报工;参数为：{}", req);
-            return apsReportRecordsService.cancelRecord(req);
-        } catch (Exception e) {
-            e.printStackTrace();
-            return R.error("取消报工错误");
-        }
+        log.info("取消报工;参数为：{}", req);
+        return apsReportRecordsService.cancelRecord(req);
+
     }
 
     /**
      * 开工
      */
     @PostMapping("/startReport")
-    public R startReport(@RequestBody StartRePortReq req){
+    public R startReport(@RequestBody StartRePortReq req) {
+        log.info("开工;参数为：{}", req);
         return apsReportRecordsService.startReport(req);
     }
 
@@ -59,7 +57,8 @@ public class ApsReportRecordController {
      * 报工保存
      */
     @PostMapping("/saveReport")
-    public R saveReport(@RequestBody SaveReportReq req){
+    public R saveReport(@RequestBody SaveReportReq req) {
+        log.info("报工保存;参数为：{}", req);
         return apsReportRecordsService.saveReport(req);
     }
 
@@ -67,7 +66,8 @@ public class ApsReportRecordController {
      * 开工之后，查询是否存在未开工的合并工序
      */
     @PostMapping("/checkMergeProcess")
-    public R checkMergeProcess(@RequestBody ApsReportRecordsDo req){
+    public R checkMergeProcess(@RequestBody ApsReportRecordsDo req) {
+        log.info("开工之后，查询是否存在未开工的合并工序;参数为：{}", req);
         return apsReportRecordsService.checkMergeProcess(req);
     }
 
@@ -75,7 +75,8 @@ public class ApsReportRecordController {
      * 小卷开工
      */
     @PostMapping("/smallRollStartReport")
-    public R smallRollStartReport(@RequestBody SmallRollStartReportReq req){
+    public R smallRollStartReport(@RequestBody SmallRollStartReportReq req) {
+        log.info("小卷开工;参数为：{}", req);
         return apsReportRecordsService.smallRollStartReport(req);
     }
 }