feature

1.修改更新待检验料卷批次号的逻辑

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

@@ -16,7 +16,8 @@ import java.util.List;
  */
 public interface ApsProcessOperationProcessEquDao extends BaseMapper<ApsProcessOperationProcessEquDo> {
 
-    void updateBachmaterialprocessByIds(@Param("ids") List<String> ids, @Param("batchNum") String batchNum);
+    void updateBachmaterialprocessByIds(@Param("ids") List<String> ids, @Param("batchNum") String batchNum,
+                                        @Param("nextIds") List<String> nextProcessesIds);
 
     /**
      * 更新 工序明细的 实际完工时间 完工状态 作业状态  已检验卷数 未完工卷数

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

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

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

@@ -203,7 +203,9 @@ public class ReportCheckServiceImpl implements ReportCheckService {
             //更新后续工序的待加工批次号信息
             apsProcessOperationService.updateBachmaterialprocessByIds(nextProcessIds, toBeProcessedBatchNum,
                     unqualifiedQuantity);
-            apsProcessOperationProcessEquService.updateBachmaterialprocessByIds(nextProcessIds, toBeProcessedBatchNum);
+            // 下一个工序作业明细
+            apsProcessOperationProcessEquService.updateBachmaterialprocessByIds(nextProcessIds, toBeProcessedBatchNum,
+                    currentProcessOperationEqu.getNextprocessesids());
         }
         /***************************存在不合格批次信息时 更新更新报工记录对应订单的订单评审状态=待计划评审， 订单调整日期=今天*************************************/
         if (unqualifiedQuantity > 0) {

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

@@ -53,6 +53,12 @@
             <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}
+                </foreach>
+            </if>
         </where>
     </update>
     <update id="updateAboutCheckBatchNum">