单据管理

src/main/java/com/glxp/api/controller/auth/InvSpaceController.java

@@ -6,6 +6,7 @@ import com.glxp.api.common.enums.ResultEnum;
 import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
 import com.glxp.api.constant.ConstantStatus;
+import com.glxp.api.dto.DictDto;
 import com.glxp.api.entity.auth.InvSpace;
 import com.glxp.api.entity.auth.InvWarehouseEntity;
 import com.glxp.api.req.auth.FilterInvSpaceRequest;
@@ -23,6 +24,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 货位字典接口
@@ -56,6 +58,31 @@ public class InvSpaceController {
         return ResultVOUtils.success(pageSimpleResponse);
     }
 
+    @GetMapping("/spms/inv/space/filterOptimize")
+    public BaseResponse filterListOptimize(FilterInvSpaceRequest filterInvSpaceRequest) {
+        if (StrUtil.isNotEmpty(filterInvSpaceRequest.getFilterType())) {
+            if (filterInvSpaceRequest.getFilterType().equals("preIn")) {
+                InvWarehouseEntity invWarehouseEntity = invWarehouseService.findByOne(ConstantStatus.ACTION_TYPE_PREIN);
+                filterInvSpaceRequest.setInvWarehouseCode(invWarehouseEntity.getCode());
+            } else if (filterInvSpaceRequest.getFilterType().equals("pre")) {
+                InvWarehouseEntity invWarehouseEntity = invWarehouseService.findByOne(ConstantStatus.ACTION_TYPE_ADVANCE);
+                filterInvSpaceRequest.setInvWarehouseCode(invWarehouseEntity.getCode());
+            }
+        }
+
+        List<InvSpaceResponse> list = invSpaceService.filterList(filterInvSpaceRequest);
+        List<DictDto> reList = list.stream().map(s-> {
+            DictDto dictDto = new DictDto(s.getCode(),s.getName());
+            return dictDto;
+        }).collect(Collectors.toList());
+
+        PageInfo<DictDto> pageInfo = new PageInfo<>(reList);
+        PageSimpleResponse<DictDto> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setList(reList);
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
+
     /**
      * 添加货位
      *

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

@@ -570,6 +570,18 @@ public class BasicCorpController extends BaseController {
         return ResultVOUtils.success(getCorpList);
     }
 
+    @AuthRuleAnnotation("")
+    @PostMapping("/udiwms/basic/unit/maintain/selectCorpListOptimize")
+    public BaseResponse selectCorpListOptimize(@RequestBody BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest) {
+
+        List<BasicCorpEntity> getCorpList = basicUnitMaintainService.selectCorpList(basicUnitMaintainFilterRequest);
+        List<DictDto> reList = getCorpList.stream().map(s-> {
+            DictDto dictDto = new DictDto(s.getErpId(),s.getName());
+            return dictDto;
+        }).collect(Collectors.toList());
+        return ResultVOUtils.success(reList);
+    }
+
     @AuthRuleAnnotation("")
     @GetMapping("/udiwms/basic/unit/maintain/getCorpLists")
     public BaseResponse getCorpLists() {

src/main/java/com/glxp/api/entity/auth/SysCustomConfigDetailEntity.java

@@ -173,4 +173,16 @@ public class SysCustomConfigDetailEntity {
      */
     @TableField("inputType")
     private String inputType;
+
+    /**
+     * 获取数据方法
+     */
+    @TableField("dataFuc")
+    private String dataFuc;
+
+    /**
+     * 是否展示详细 1是 2否
+     */
+    @TableField("isShowXx")
+    private String isShowXx;
 }

src/main/java/com/glxp/api/service/sync/WebSocketComponent.java

@@ -16,7 +16,7 @@ import javax.annotation.Resource;
 import java.net.URISyntaxException;
 
 @Slf4j
-@Component
+//@Component
 public class WebSocketComponent implements CommandLineRunner {
 
     @Value("${SPMS_WEBSOCKET_TOKEN}")

src/main/resources/mybatis/mapper/auth/SysCustomConfigDetailDao.xml

@@ -25,10 +25,10 @@
             parameterType="com.glxp.api.entity.auth.SysCustomConfigDetailEntity">
         INSERT INTO sys_custom_config_detail
                 (id,configId,type,isShow, columnName,columnDesc,columnType,colorRule,sort,lableRule,width,tooltip,buttonRule,number,
-                 clickFuc,disabledFuc,expression,size,style,disabled,checkRules,inputType,lineNumber)
+                 clickFuc,disabledFuc,expression,size,style,disabled,checkRules,inputType,lineNumber,dataFuc,isShowXx)
         values (#{id},#{configId},#{type},#{isShow}, #{columnName},#{columnDesc},#{columnType},#{colorRule},#{sort},
                 #{lableRule},#{width},#{tooltip},#{buttonRule},#{number},#{clickFuc},#{disabledFuc},#{expression},#{size},#{style},
-                #{disabled}, #{checkRules}, #{inputType}, #{lineNumber})
+                #{disabled}, #{checkRules}, #{inputType}, #{lineNumber}, #{dataFuc},#{isShowXx})
     </insert>
 
     <update id="updateSysCustomConfigDetail" parameterType="com.glxp.api.entity.auth.SysCustomConfigDetailEntity">
@@ -100,6 +100,12 @@
             <if test="lineNumber != null">
                 lineNumber=#{lineNumber},
             </if>
+            <if test="dataFuc != null">
+                dataFuc=#{dataFuc},
+            </if>
+            <if test="isShowXx != null">
+                isShowXx=#{isShowXx},
+            </if>
         </set>
         WHERE id = #{id}
     </update>