aps-领料修改

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

@@ -179,5 +179,5 @@ public interface ApsBlankOrderDao extends BaseMapper<ApsBlankOrderDo> {
 
     List<ApsBlankOrderVo> getNeedScheduleList(@Param("tenantId") String tenantId);
 
-    List<ApsBlankOrderDo> selectBlankByStartNum(@Param("startNum") String startNum, @Param("blankId") String blankId);
+    List<ApsBlankOrderDo> selectBlankByStartNum(@Param("startNum") String startNum);
 }

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

@@ -771,7 +771,7 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
      */
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public void apsAfter(ProductionScheduleRetVo productionScheduleRetVo, List<ApsBlankOrderVo> apsBlankOrders, SysUserVo currentUser, ApsTypeVo apsType)  throws Exception{
+    public void apsAfter(ProductionScheduleRetVo productionScheduleRetVo, List<ApsBlankOrderVo> apsBlankOrders, SysUserVo currentUser, ApsTypeVo apsType) throws Exception {
         // 先删除所有作业的明细
         List<String> blankids = CollUtil.distinct(productionScheduleRetVo.getProcesses().stream().map(v -> v.getProduceOrder().get(0).getId()).collect(Collectors.toList()));
 //        List<String> blankids = apsBlankOrders.stream().map(v -> v.getId()).collect(Collectors.toList());
@@ -3646,7 +3646,7 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                         addBatchNumberList.set(i, s);
                         //批次号"-"之前的值
                         String startNum = s.split("-")[0];
-                        List<ApsBlankOrderDo> list = this.baseMapper.selectBlankByStartNum(startNum, req.getBlankId());
+                        List<ApsBlankOrderDo> list = this.baseMapper.selectBlankByStartNum(startNum);
                         if (!list.isEmpty()) {
                             for (ApsBlankOrderDo blankOrderDo : list) {
                                 String[] batchs = blankOrderDo.getPreparematerialbatchno().split(",");
@@ -4119,13 +4119,13 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                         s = "*" + s;
                     }
 
-                    Integer count = this.baseMapper.selectCountWorkIn(s);
-                    if (count > 0) {
-                        return R.error("线下批次号" + s + "与其他线下批次号重复");
-                    }
+//                    Integer count = this.baseMapper.selectCountWorkIn(s);
+//                    if (count > 0) {
+//                        return R.error("线下批次号" + s + "与其他线下批次号重复");
+//                    }
                     //批次号"-"之前的值
                     String startNum = s.split("-")[0];
-                    List<ApsBlankOrderDo> list = this.baseMapper.selectBlankByStartNum(startNum, req.getBlankId());
+                    List<ApsBlankOrderDo> list = this.baseMapper.selectBlankByStartNum(startNum);
                     if (!list.isEmpty()) {
                         for (ApsBlankOrderDo blankOrderDo : list) {
                             String[] batchs = blankOrderDo.getPreparematerialbatchno().split(",");
@@ -4210,6 +4210,17 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
 
 
             if (ObjectUtil.isNotEmpty(offLineBatchNumberList)) {
+                for (String s : offLineBatchNumberList) {
+                    List<String> list = new LinkedList<>(offLineBatchNumberList);
+                    list.remove(s);
+                    for (String batch : list) {
+                        if (batch.startsWith(s + "-")
+                                || s.startsWith(batch + "-")) {
+                            return R.error("线下批次号" + s + "和线下批次号" + batch + "不能同时领料");
+                        }
+                    }
+                }
+
                 res = "<b>" + String.join(",", offLineBatchNumberList) + "是线下批次号，确认领料吗？</b><br>";
             }
             if (ObjectUtil.isNotEmpty(onLineBatchNumberWarnList)) {

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

@@ -595,6 +595,5 @@
         from aps_blank_order
         where DELETED = 0
         AND PREPAREMATERIALBATCHNO like CONCAT('%',#{startNum},'%')
-        AND ID != #{blankId}
     </select>
 </mapper>