Merge branch 'zypms' of http://47.97.1.152:5880/r/wms_saas into zypms

whycq

2022-09-06 bd6095e7af86faf7ed0a5ca188775aeac7b031f2

Merge branch 'zypms' of http://47.97.1.152:5880/r/wms_saas into zypms


 Conflicts:

	src/main/webapp/static/js/tableData2.js

 src/main/java/zy/cloud/wms/manager/controller/ItemController.java

@@ -142,8 +142,6 @@
        if (Cools.isEmpty(cstmr)) {
            throw new CoolException("找不到该客户,请检查");
        }


        item.setCustMan(cstmr.getName());
        item.setCustMobile(cstmr.getTel());
        item.setCustAdress(cstmr.getAddr());
@@ -165,6 +163,7 @@
        if (Cools.isEmpty(item)) {
            return R.error("参数为空,请联系管理员");
        }

//        item.setType("1");
//        if (!item.getType().equals("1")) {
//            throw new CoolException("目前仅支持集成项目");

 src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java

@@ -270,8 +270,17 @@
     * @return
     */
    @RequestMapping("/projectPlan/flowStatus")
    public R flowStatus(){
    public R flowStatus(
            @RequestParam(defaultValue = "1") Integer curr,
            @RequestParam(defaultValue = "10") Integer limit,
            @RequestParam(required = false) String orderByField,
            @RequestParam(required = false) String orderByType,
            @RequestParam Map<String, Object> param
    ){

        EntityWrapper<FlowStatus> wrapper = new EntityWrapper<>();
        excludeTrash(param);
        convert(param, wrapper);
        wrapper.orderBy("weight_num");
        List<FlowStatus> flowStatuses = flowStatusService.selectList(wrapper);

@@ -283,8 +292,17 @@
     * @return
     */
    @RequestMapping("/projectPlan/toFront")
    public R toFront(){
        List<Item> items = itemService.selectList(new EntityWrapper<Item>()
    public R toFront(
            @RequestParam(defaultValue = "1") Integer curr,
            @RequestParam(defaultValue = "10") Integer limit,
            @RequestParam(required = false) String orderByField,
            @RequestParam(required = false) String orderByType,
            @RequestParam Map<String, Object> param
    ){
        EntityWrapper<Item> itemEntityWrapper = new EntityWrapper<>();
        excludeTrash(param);
        convert(param, itemEntityWrapper);
        List<Item> items = itemService.selectList(itemEntityWrapper
                .eq("status","1"));
        List<ItemsDTO> itemsDTOs = new ArrayList<>();


 src/main/java/zy/cloud/wms/manager/service/impl/ItemServiceImpl.java

@@ -47,10 +47,10 @@
    @Transactional
    @Override
    public void insertAll(Item item) {

        this.insert(item);
        Integer isAsrs = item.getType().equals("10")? 1: 0;
        List<FlowStatus> allTypes = flowStatusService.selectList(new EntityWrapper<FlowStatus>()
                .eq("type", item.getType())
                .eq("is_asrs", isAsrs)
                .orderBy("weight_num",true));
        for (FlowStatus oneType : allTypes) {
            ProjectPlan projectPlan = new ProjectPlan();

 src/main/resources/mapper/ItemMapper.xml

@@ -82,7 +82,7 @@
        </if>
    </select>
    <select id="inspected" resultMap="BaseResultMap">
        select * from man_item where realLADate is not null
        select * from man_item where real_end_time is not null
    </select>
    <select id="finished" resultMap="BaseResultMap">
        select * from man_item where realLADate is null and realinDate is not null