Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/glxp/api/constant/Constant.java

@@ -287,6 +287,7 @@ public class Constant {
     public static final String ORDER_ACTION_WAIT_CHECK = "waitCheck";   //待校验
     public static final String ORDER_ACTION_WAIT_DEAL = "waitDeal";     //待配货/拣货
     public static final String ORDER_THIRD_UPLOAD = "thirdUpload";
+    public static final String ORDER_THIRD_STOCK = "stock";    //内部码
 
     public static final String SYNC_REMARK = "syncRemark";
 }

src/main/java/com/glxp/api/controller/basic/BasicProductCategoryController.java

@@ -227,6 +227,7 @@ public class BasicProductCategoryController {
             list.add(udiRelevanceResponse.getId());
         }
         filterUdiRelRequest.setExistid(list);
+        filterUdiRelRequest.setIsDisable(false);
         List<UdiRelevanceResponse> udiRelevanceResponses = null;
 
 

src/main/java/com/glxp/api/controller/inout/IoOrderController.java

@@ -97,8 +97,10 @@ public class IoOrderController extends BaseController {
         }
         if (StrUtil.isNotBlank(filterOrderRequest.getVueType())) {
             orderService.setActions(filterOrderRequest);
+            //要是不存在要查询的单据类型就直接放回空
             if (CollUtil.isEmpty(filterOrderRequest.getActions())) {
-                return ResultVOUtils.success(null);
+                PageInfo<IoOrderResponse> pageInfo = new PageInfo<>(new ArrayList<>());
+                return ResultVOUtils.page(pageInfo);
             }
         }
         if (StrUtil.isNotEmpty(filterOrderRequest.getSupInoivceSearch())) {
@@ -130,7 +132,12 @@ public class IoOrderController extends BaseController {
             orderService.setFilterStatus(filterOrderRequest);
         }
         if (StrUtil.isNotBlank(filterOrderRequest.getVueType())) {
-            orderService.setActions(filterOrderRequest);
+            //要是不存在要查询的单据类型就直接放回空
+          if(orderService.setActions(filterOrderRequest) == null){
+              PageInfo<IoOrderResponse> pageInfo = new PageInfo<>(new ArrayList<>());
+              return ResultVOUtils.page(pageInfo);
+          }
+
         }
 
         if (StrUtil.isNotEmpty(filterOrderRequest.getSupInoivceSearch())) {

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

@@ -3,6 +3,7 @@ package com.glxp.api.service.basic;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.glxp.api.constant.ConstantStatus;
 import com.glxp.api.dao.basic.UdiRelevanceDao;
 import com.glxp.api.entity.basic.UdiProductEntity;
@@ -207,13 +208,27 @@ public class UdiContrastService {
     }
 
     public void insertUdiInfos(List<UdiProductEntity> udiInfoEntities) {
+        Boolean falg=false;
+        String uuid="";
         if (CollUtil.isNotEmpty(udiInfoEntities)) {
             UdiProductEntity udiProductEntity = udiProductService.findByUuid(udiInfoEntities.get(0).getUuid());
             if (udiProductEntity == null) {
                 for (UdiProductEntity udiInfoEntity : udiInfoEntities) {
                     udiInfoEntity.setId(IdUtil.getSnowflakeNextId());
+                    if(udiInfoEntity.getZxxsbzbhsydysl()>0){
+                        uuid=udiInfoEntity.getUuid();
+                        falg=true;
+                    }
                 }
                 udiProductService.insertUdiInfos(UdiInfoUtil.initUdiInfoEntitys(udiInfoEntities));
+                //判断产品zxxsbzbhsydysl大于0就启动使用单元
+                if(falg){
+                    QueryWrapper<UdiRelevanceEntity> ew=new QueryWrapper<>();
+                    ew.eq("uuid",uuid);
+                    UdiRelevanceEntity udiRelevanceEntity=new UdiRelevanceEntity();
+                    udiRelevanceEntity.setIsUseDy(true);
+                    udiRelevanceService.update(udiRelevanceEntity,ew);
+                }
             }
         }
     }

src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java

@@ -295,6 +295,21 @@ public class BasicBussinessTypeServiceImpl extends ServiceImpl<BasicBussinessTyp
                         )
                 );
                 break;
+            case Constant.ORDER_THIRD_STOCK: //内部码
+                bussinessTypeEntities = basicBussinessTypeDao.selectList(new QueryWrapper<BasicBussinessTypeEntity>()
+                        .eq("enable", true).and(
+                                webNew -> webNew.in("checkWebNew", 1, 2, 3)
+                                        .or().in("checkPdaUn", 1, 2, 3)
+                                        .or().in("checkPdaEd", 1, 2, 3)
+                                        .or().in("checkUdims", 1, 2, 3)
+                                        .or().in("checkPc", 1, 2, 3)
+                                        .or().in("checkSp", 1, 2, 3)
+                                        .or().in("checkChange", 1, 2, 3)
+                                        .or().in("checkBalance", 1, 2, 3)
+                                        .or().in("checkCopy", 1, 2, 3)
+                        )
+                );
+                break;
             case Constant.ORDER_THIRD_UPLOAD:
 
                 List<ThrOrderUploadBustypesEntity> thrOrderUploadBustypesEntities = thrOrderUploadBustypesService.list();

src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java

@@ -49,6 +49,7 @@ import com.glxp.api.util.MsDateUtil;
 import com.glxp.api.util.IntUtil;
 import com.glxp.api.util.udi.UdiCalCountUtil;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
@@ -709,6 +710,9 @@ public class IoOrderServiceImpl implements IoOrderService {
         if (filterOrderRequest.getVueType() == null)
             return null;
         bussinessTypeEntities = basicBussinessTypeService.findByVueType(filterOrderRequest.getVueType());
+        if(CollectionUtils.isEmpty(bussinessTypeEntities)){
+            return null;
+        }
         actions = bussinessTypeEntities.stream().map(BasicBussinessTypeEntity::getAction).collect(Collectors.toList());
         filterOrderRequest.setActions(actions);
         return actions;

src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml

@@ -116,6 +116,9 @@
             <if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null">
                 AND basic_products.ylqxzcrbarmc LIKE concat(#{ylqxzcrbarmc}, '%')
             </if>
+            <if test="manufactory != '' and manufactory != null">
+                AND basic_products.manufactory LIKE concat(#{manufactory}, '%')
+            </if>
             <if test="cpmctymc != '' and cpmctymc != null">
                 AND cpmctymc LIKE concat('%', #{cpmctymc}, '%')
             </if>
@@ -148,7 +151,7 @@
                 AND basic_udirel.thirdId = #{thirdId}
             </if>
             <if test="zczbhhzbapzbh != '' and zczbhhzbapzbh != null">
-                AND zczbhhzbapzbh LIKE concat(#{zczbhhzbapzbh}, '%')
+                AND basic_products.zczbhhzbapzbh LIKE concat(#{zczbhhzbapzbh}, '%')
             </if>
             <if test="diType != '' and diType != null">
                 AND diType = #{diType}