切换分支备份

src/main/java/com/glxp/api/service/collect/down/ThrOrderDownload.java

@@ -109,7 +109,6 @@ public class ThrOrderDownload implements IDownload {
 
                     if (BusTypeConstant.QXCF001.getBusType().equals(collectOrderRequest.getBusType())) {
                         collectOrderBiz.setRelId(entity.getRelId());
-
                         if (StrUtil.isNotEmpty(entity.getCheckCode())) {
                             // 1. 先查询完全匹配的情况
                             LambdaQueryWrapper<BasicProductsEntity> exactMatchWrapper = new LambdaQueryWrapper<>();
@@ -121,7 +120,6 @@ public class ThrOrderDownload implements IDownload {
                                 prefixMatchWrapper.apply("LEFT(ybbm, 20) = LEFT({0}, 20)", entity.getCheckCode());
                                 exactMatches = basicProductsDao.selectList(prefixMatchWrapper);
                             }
-                            collectOrderBiz.setRelId(entity.getRelId());
                             if (exactMatches.isEmpty()) {
                                 errorMsg.append(entity.getCpmctymc()).append("字典未对照").append(";");
                             }

src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java

@@ -331,19 +331,19 @@ public class IoSplitCodeService extends ServiceImpl<IoSplitCodeMapper, IoSplitCo
             }
             int quotient = 0;
             int remainder = 0;
-            if(IntUtil.value(udiRelevanceResponse.getBhxjsl()) != 0){
+            if (IntUtil.value(udiRelevanceResponse.getBhxjsl()) != 0) {
                 quotient = collectOrderBiz.getUnTagCount() / IntUtil.value(udiRelevanceResponse.getBhxjsl());
                 remainder = collectOrderBiz.getUnTagCount() % IntUtil.value(udiRelevanceResponse.getBhxjsl());
             }
             //2.如果整盒，从工位队列扣除   默认最后一个追溯码拆零
             if (quotient > 0) {
-                List<IoSplitFifoCodeEntity> ioSplitFifoCodeEntities = splitFifoCodeService.findByRelId(putWorkPlaceCode, collectOrderBiz.getRelId(), collectOrderBiz.getBatchNo(),queueCode );
+                List<IoSplitFifoCodeEntity> ioSplitFifoCodeEntities = splitFifoCodeService.findByRelId(putWorkPlaceCode, collectOrderBiz.getRelId(), collectOrderBiz.getBatchNo(), queueCode);
                 if (ioSplitFifoCodeEntities.size() < quotient) {
                     if (isAuto)
                         throw new JsonException(500, "提交失败，工位库存数量不足！");
 //                    else return;
                 }
-                if (ioSplitFifoCodeEntities.size() > 0){
+                if (ioSplitFifoCodeEntities.size() > 0) {
                     for (int i = 0; i < quotient; i++) {
                         IoSplitFifoCodeEntity splitFifoCodeEntity = ioSplitFifoCodeEntities.get(i);
                         collectOrderBiz.setUnTagCount(IntUtil.value(collectOrderBiz.getUnTagCount()) - IntUtil.value(udiRelevanceResponse.getBhxjsl()));