aps取消开工

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/dao/ApsProcessOperationDao.java

@@ -49,4 +49,9 @@ public interface ApsProcessOperationDao extends BaseMapper<ApsProcessOperationDo
 
     @Update("update aps_process_operation set STARTINGROLL = STARTINGROLL - 1 where ID = #{processoperationid}")
     void updateByCancelRecord(@Param("processoperationid") String processoperationid);
+
+    @Update("update aps_process_operation_process_equ set BACHMATERIALPROCESS = concat(BACHMATERIALPROCESS,',',#{batchnumber}) where DELETED = 0 AND ID = #{processoperationid}")
+    void updateBatchNumberByProcessId(@Param("batchnumber") String batchnumber, @Param("processoperationid") String processoperationid);
+
+    void updateBatchNumberByProcessList(@Param("batchnumber") String batchnumber, @Param("processIdList") List<String> processIdList);
 }

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

@@ -75,7 +75,7 @@ public class ApsReportOutputServiceImpl extends ServiceImpl<ApsReportOutputDao,
                         JSONObject json = new JSONObject();
                         json.put("batchNumber", code);
                         //生成二维码
-                        String qrCode = QRCodeGenerator.stringToQRCodeBase64(json.toJSONString(), 120, 120, "png");
+                        String qrCode = QRCodeGenerator.stringToQRCodeBase64(json.toJSONString(), 200, 200, "png");
                         apsReportOutputDo.setQrcode(qrCode);
                         apsReportOutputDo.setId(SecurityUtil.getUUID());
                         resList.add(apsReportOutputDo);
@@ -98,7 +98,7 @@ public class ApsReportOutputServiceImpl extends ServiceImpl<ApsReportOutputDao,
                         JSONObject json = new JSONObject();
                         json.put("batchNumber", code);
                         //生成二维码
-                        String qrCode = QRCodeGenerator.stringToQRCodeBase64(json.toJSONString(), 120, 120, "png");
+                        String qrCode = QRCodeGenerator.stringToQRCodeBase64(json.toJSONString(), 200, 200, "png");
                         apsReportOutputDo.setQrcode(qrCode);
                         resList.add(apsReportOutputDo);
                     }
@@ -118,7 +118,7 @@ public class ApsReportOutputServiceImpl extends ServiceImpl<ApsReportOutputDao,
                 JSONObject json = new JSONObject();
                 json.put("batchNumber", req.getInputBatchNumber());
                 //生成二维码
-                String qrCode = QRCodeGenerator.stringToQRCodeBase64(json.toJSONString(), 120, 120, "png");
+                String qrCode = QRCodeGenerator.stringToQRCodeBase64(json.toJSONString(), 200, 200, "png");
                 apsReportOutputDo.setQrcode(qrCode);
                 resList.add(apsReportOutputDo);
             } else {//输出物料数量>1，或者单卷输出数量>1
@@ -146,7 +146,7 @@ public class ApsReportOutputServiceImpl extends ServiceImpl<ApsReportOutputDao,
                         JSONObject json = new JSONObject();
                         json.put("batchNumber", code);
                         //生成二维码
-                        String qrCode = QRCodeGenerator.stringToQRCodeBase64(json.toJSONString(), 120, 120, "png");
+                        String qrCode = QRCodeGenerator.stringToQRCodeBase64(json.toJSONString(), 200, 200, "png");
                         apsReportOutputDo.setQrcode(qrCode);
 
                         apsReportOutputDo.setId(SecurityUtil.getUUID());

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

@@ -14,7 +14,9 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  *
@@ -36,6 +38,8 @@ implements ApsReportRecordsService {
     private ApsProcessOperationProcessEquDao apsProcessOperationProcessEquDao;
     @Resource
     private ApsProcessOperationDao apsProcessOperationDao;
+    @Autowired
+    private ApsProcessOperationService apsProcessOperationService;
 
     @Override
     @Transactional
@@ -105,6 +109,29 @@ implements ApsReportRecordsService {
         if(ObjectUtil.isNotEmpty(equDo.getUnfinishroll()) && equDo.getUnfinishroll() == 0){
             apsProcessOperationProcessEquDo.setWorkstatus("已完工");
         }
+
+        /**
+         * 如果输入物料有批次号，则
+         * 如果该工序作业没有前道工序作业，则该工序作业所有作业明细的待加工料卷批次号加上“{批次号}，”
+         * 如果该工序作业有前道工序作业，则输入物料对应前道工序作业的输出物料的所有后道工序作业的所有作业明细的待加工料卷批次号加上“{批次号}，”
+         */
+        if(ObjectUtil.isNotEmpty(recordsDo.getBatchnumber())){
+            //查询工序作业
+            ApsProcessOperationDo apsProcessOperationDo = apsProcessOperationService.getById(processoperationid);
+            //没有前道工序
+            if(ObjectUtil.isEmpty(apsProcessOperationDo.getPreviousprocessid())){
+                apsProcessOperationDao.updateBatchNumberByProcessId(recordsDo.getBatchnumber(),processoperationid);
+            }
+            //有前道工序
+            if(ObjectUtil.isNotEmpty(apsProcessOperationDo.getPreviousprocessid())){
+                //查询所有同级工序
+                List<ApsProcessOperationDo> list = apsProcessOperationService.list(new QueryWrapper<ApsProcessOperationDo>().lambda().eq(ApsProcessOperationDo::getPreviousprocessid, apsProcessOperationDo.getPreviousprocessid()));
+                List<String> processIdList = list.stream().map(ApsProcessOperationDo::getId).collect(Collectors.toList());
+                //更新所有同级工序作业的明细，增加批次号
+                apsProcessOperationDao.updateBatchNumberByProcessList(recordsDo.getBatchnumber(),processIdList);
+            }
+        }
+
         apsProcessOperationProcessEquDao.updateById(apsProcessOperationProcessEquDo);
 
         //更新其余信息

cx-aps/cx-aps-common/src/main/resources/mybatis/ApsProcessOperationDao.xml

@@ -36,6 +36,15 @@
             ID =#{id}
         </where>
     </update>
+    <update id="updateBatchNumberByProcessList">
+        update aps_process_operation_process_equ
+        set BACHMATERIALPROCESS = concat(BACHMATERIALPROCESS,',',#{batchnumber})
+        where DELETED = 0
+        AND PROCESSID in
+        <foreach collection="processIdList" separator="," open="(" item="item" close=")">
+            #{item}
+        </foreach>
+    </update>
     <resultMap id="ProcessIdRelationMap" type="com.rongwei.bsentity.vo.ProcessIdRelationVo">
         <result property="id" column="ID" jdbcType="VARCHAR"/>
         <result property="nextprocessid" column="NEXTPROCESSID" jdbcType="VARCHAR"/>