Merge remote-tracking branch 'origin/dev_2.5_scan' into dev_2.5_scan

src/main/java/com/glxp/api/service/basic/UdiRelevanceService.java

@@ -425,10 +425,10 @@ public class UdiRelevanceService extends ServiceImpl<UdiRelevanceDao, UdiRelevan
 
 
     public List<UdiRelevanceResponse> selectGroupByNameCode(String nameCode, Boolean isDisable) {
-        FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest();
+//        FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest();
-        filterUdiRelRequest.setNameCode(nameCode);
+//        filterUdiRelRequest.setNameCode(nameCode);
-        filterUdiRelRequest.setIsDisable(isDisable);
+//        filterUdiRelRequest.setIsDisable(isDisable);
-        return udiRelevanceDao.filterUdiGp(filterUdiRelRequest);
+        return udiRelevanceDao.selectGroupByNameCode(nameCode, isDisable);
     }
 
     public UdiRelevanceResponse selectOneUdi(FilterUdiRelRequest filterUdiRelRequest) {

src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java

@@ -126,6 +126,7 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
         return collectOrderCodeManMapper.selectOne(new LambdaQueryWrapper<IoCollectOrderCodeMan>().eq(IoCollectOrderCodeMan::getOrderIdFk, billNo)
                 .eq(IoCollectOrderCodeMan::getUdiCode, code).last("limit 1"));
     }
+
     @Resource
     SysWorkplacePutRelService workplacePutRelService;
     @Resource
@@ -166,9 +167,9 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
         //判断层级标识是否正确
         if (IntUtil.value(sysWorkplaceDocumentEntity.getOrderCirType()) == 2) {
 
-            if(IntUtil.value(udiRelevanceResponse.getProductsType()) == 1){
+            if (IntUtil.value(udiRelevanceResponse.getProductsType()) == 1) {
 
-            }else {
+            } else {
                 if (udiRelevanceResponse.getUseMaxLevel() != null && IntUtil.value(udiRelevanceResponse.getPackLevel()) > IntUtil.value(udiRelevanceResponse.getUseMaxLevel())) {
                     throw new JsonException(500, "当前产品不支持采集该包装层级追溯码！");
                 }
@@ -193,7 +194,7 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
         //2-1.校验预验收库存是否已存在
         String preInBillNo = addTagCodeReqeust.getPreInBillNo();
         String orderId = addTagCodeReqeust.getBillNo();
-        if (StrUtil.isNotEmpty(preInBillNo)){
+        if (StrUtil.isNotEmpty(preInBillNo)) {
             BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction("SC74047387362851");
             if (bussinessTypeEntity.isScanPreIn() && checkDiAttribute(bussinessTypeEntity, udiRelevanceResponse, 2)) {
                 if (bussinessTypeEntity.getBackPreinType() == 1 && bussinessTypeEntity.isPreInBack()) {//按单出库&& bussinessTypeEntity.isPreInBack()
@@ -203,7 +204,7 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
                         List<String> orderList = CollUtil.toList(orderIdArray);
                         int count = codeService.findByOrderIdsCount(orderList, code);
                         if (count <= 0) {
-                           throw new JsonException(500, "非预验收单产品或预验收库存数量不足！");
+                            throw new JsonException(500, "非预验收单产品或预验收库存数量不足！");
                         }
                         if (StrUtil.isNotEmpty(orderId)) {//非首次添加
                             if (StrUtil.isEmpty(udiEntity.getSerialNo())) {//该单据已有该产品
@@ -789,7 +790,7 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
     }
 
     public Integer getScanCount(String billNo, Long relId) {
-        return collectOrderCodeManMapper.getScanCount(billNo,relId);
+        return collectOrderCodeManMapper.getScanCount(billNo, relId);
     }
 
     /**