Merge branch 'refs/heads/master' into mode-min-unit

# Conflicts:
#	cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsProcessOperationProcessEquServiceImpl.java
#	cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ReportCheckServiceImpl.java
#	cx-aps/cx-aps-common/src/main/resources/mybatis/ApsProcessOperationProcessEquDao.xml

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

@@ -69,7 +69,8 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
     public void updateBachmaterialprocessByIds(List<String> ids, String batchNumn,String nextprocessesids) {
         if (StringUtils.isNotBlank(batchNumn)) {
             apsProcessOperationProcessEquDao.updateBachmaterialprocessByIds(ids, batchNumn,
-                    StringUtils.isBlank(nextprocessesids)?null:Arrays.asList(nextprocessesids.split(",")));
+                    StringUtils.isBlank(nextprocessesids)?null:Arrays.asList(nextprocessesids.split(","))
+                    );
         }
     }
 

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

@@ -501,6 +501,10 @@ public class ApsReportRecordsServiceImpl extends ServiceImpl<ApsReportRecordsDao
         if (apsProcessOperationProcessEquDo.getClosestatus().equals("未完工") && apsProcessOperationProcessEquDo.getStartingroll() > 0) {
             needUpdateProcessOperationProcessEquDo.setWorkstatus("加工中");
         }
+        if (ObjectUtil.isNotEmpty(unfinishroll) && unfinishroll == 0) {
+            needUpdateProcessOperationProcessEquDo.setWorkstatus("已完工");
+        }
+
         //清空加工中批次号
         needUpdateProcessOperationProcessEquDo.setDoingbatchnumber("");
         apsProcessOperationProcessEquService.updateById(needUpdateProcessOperationProcessEquDo);

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

@@ -203,7 +203,6 @@ public class ReportCheckServiceImpl implements ReportCheckService {
             //更新后续工序的待加工批次号信息
             apsProcessOperationService.updateBachmaterialprocessByIds(nextProcessIds, toBeProcessedBatchNum,
                     unqualifiedQuantity);
-            // 下一个工序作业明细
             apsProcessOperationProcessEquService.updateBachmaterialprocessByIds(nextProcessIds, toBeProcessedBatchNum,
                     currentProcessOperationEqu.getNextprocessesids());
         }

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

@@ -53,10 +53,10 @@
             <foreach collection="ids" separator="," open="(" close=")" item="id">
                 #{id}
             </foreach>
-            <if test="nextIds != null and nextIds.size()>0">
-                and ID in
-                <foreach collection="nextIds" separator="," open="(" close=")" item="nextId">
-                    #{nextId}
+            <if test="nextProcessesIds != null and nextProcessesIds.size()>0">
+               and ID in
+                <foreach collection="nextProcessesIds" separator="," open="(" close=")" item="id">
+                    #{id}
                 </foreach>
             </if>
         </where>