aps-报工增加明细的计划开工，实际开工回填

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

@@ -1008,7 +1008,13 @@ public class ApsReportRecordsServiceImpl extends ServiceImpl<ApsReportRecordsDao
             //已报工卷数
             Integer reportroll = apsProcessOperationProcessEquDo.getReportroll();
             LambdaUpdateWrapper<ApsProcessOperationProcessEquDo> processEquWrapper = new UpdateWrapper<ApsProcessOperationProcessEquDo>().lambda().eq(ApsProcessOperationProcessEquDo::getId, apsProcessOperationProcessEquDo.getId());
-            //已报工卷数=已报工卷数+输入批次号数量
+            //如果该作业明细的已报工卷数=0（第一次报工），则更新该作业明细
+            //实际开工时间=报工记录的开工时间
+            //计划开工时间=实际开工时间
+            if (reportroll == 0) {
+                processEquWrapper.set(ApsProcessOperationProcessEquDo::getActualstartdate, apsReportRecordsDo.getStartworktime());
+                processEquWrapper.set(ApsProcessOperationProcessEquDo::getPlanstartdate, apsReportRecordsDo.getStartworktime());
+            }
             Integer newReportRoll = reportroll + reduceNum;
             processEquWrapper.set(ApsProcessOperationProcessEquDo::getReportroll, newReportRoll);
 
@@ -1142,25 +1148,7 @@ public class ApsReportRecordsServiceImpl extends ServiceImpl<ApsReportRecordsDao
             }
 
             apsProcessOperationService.updateById(needUpdateProcessOperation);
-//        this.baseMapper.updateProcessReportRoll(apsProcessOperationDo.getId());
-
-//        //=============更新设备的报工记录ID===========
-//        apsProcessOperationProcessEquDao.updateEquByCancelRecord(apsReportRecordsDo.getId(), apsProcessOperationProcessEquDo.getProcessdeviceid());
-
-//        //============保存（报工）时，生成炉号和批次号=============
-//        //获取设备/炉 的炉号（每月、每个设备/炉 更新）
-//        String heatNumber;//初始化炉号
-//        //调用通用接口生成炉号
-//        SysSerialVo vo = new SysSerialVo();
-//        vo.setModulecode("aps_report_output_heat_" + apsProcessOperationProcessEquDo.getProcessdeviceid());
-//        vo.setRuleTemplateStr("@{serialNumber:#000}");
-//        vo.setResetrule("date:yyyyMM");
-//        vo.setIfautomaticreset("y");
-//        vo.setInitValue(1L);
-//        Map<String, Object> codeData = cxAdminFeginClient.getSerialNumberCode(vo).getData();
-//        heatNumber = codeData.get("code").toString();
-//
-//        apsReportRecordsDo.setHeatnumber(heatNumber);
+
             //报工状态
             apsReportRecordsDo.setReportworkstatus("已报工");
             //如过报工时间为空，填入当前时间
@@ -1185,43 +1173,7 @@ public class ApsReportRecordsServiceImpl extends ServiceImpl<ApsReportRecordsDao
             apsReportRecordsDo.setReportjccs(jccs);
             this.updateById(apsReportRecordsDo);
 
-//        //物理删除原来的报工记录输出物料
-//        this.baseMapper.deleteOutputmaterialbyMainId(apsReportRecordsDo.getId());
-//
             OrganizationCodeAndDeviceCodeVo organizationCodeAndDeviceCodeVo = this.baseMapper.selectOrganizationCodeAndDeviceCode(apsProcessOperationProcessEquDo.getProcessdeviceid());
-//        if (ObjectUtil.isEmpty(organizationCodeAndDeviceCodeVo)) {
-//            return R.error("未找到对应的车间代号和设备代号");
-//        }
-//        InsertMyReportOutputReq insertMyReportOutputReq = new InsertMyReportOutputReq();
-//        insertMyReportOutputReq.setMainId(apsReportRecordsDo.getId());
-//        insertMyReportOutputReq.setProcessId(apsProcessOperationDo.getId());
-//        insertMyReportOutputReq.setIfBlankProcess(apsProcessOperationDo.getIfblankprocess());
-//        insertMyReportOutputReq.setDeviceId(apsProcessOperationProcessEquDo.getProcessdeviceid());
-//        insertMyReportOutputReq.setMark(organizationCodeAndDeviceCodeVo.getOrganizationCode());
-//        insertMyReportOutputReq.setYearCode((DateUtil.year(DateUtil.date()) % 100) + "");
-//        insertMyReportOutputReq.setMonthCode(SaveConstans.MONTH_CODE_LIST.get(DateUtil.month(DateUtil.date())));
-//        insertMyReportOutputReq.setEquipmentCode(organizationCodeAndDeviceCodeVo.getDeviceCode());
-//        insertMyReportOutputReq.setHeatNumber(heatNumber);
-//        insertMyReportOutputReq.setInputBatchNumber(apsReportRecordsDo.getBatchnumber());
-//        insertMyReportOutputReq.setBlankType(apsBlankOrderDo.getBlanktype());
-//        insertMyReportOutputReq.setLevel(apsProcessOperationDo.getLevel());
-//
-//        R r = apsReportOutputService.insertMyReportOutput(insertMyReportOutputReq);
-//        if (!r.getCode().equals("200")) {
-//            return R.error(r.getMsg());
-//        }
-
-//            //查询新的输出物料
-//            List<ApsReportOutputDo> newOutputDos = apsReportOutputService.list(new QueryWrapper<ApsReportOutputDo>().lambda().eq(ApsReportOutputDo::getMainid, apsReportRecordsDo.getId()));
-//            //填补对应的检验等级和是否合格
-//            if (apsReportOutputDoList.size() == newOutputDos.size()) {
-//                for (int i = 0; i < newOutputDos.size(); i++) {
-//                    newOutputDos.get(i).setInsepctionlevel(apsReportOutputDoList.get(i).getInsepctionlevel());
-//                    newOutputDos.get(i).setQualified(apsReportOutputDoList.get(i).getQualified());
-//                }
-//            }
-//            //更新输出物料
-//            apsReportOutputService.updateBatchById(newOutputDos);
 
             //=================新增在制品库存=================
             //查询报工记录对应的物料子表