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

lsh

17 小时以前 3041eb1b0b76b75b916939e77c7ae97a80fe5af3

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

 src/main/java/com/zy/asrs/controller/BasCrnErrorLogController.java

@@ -42,7 +42,11 @@
        excludeTrash(param);
        convert(param, wrapper);
        allLike(BasCrnErrorLog.class, param.keySet(), wrapper, condition);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        if (Cools.isEmpty(orderByField)) {
            wrapper.orderBy("create_time", false);
        } else {
            wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
        }
        return R.ok(basCrnErrorLogService.selectPage(new Page<>(curr, limit), wrapper));
    }


 src/main/java/com/zy/asrs/controller/BasDevpErrorLogController.java

@@ -42,7 +42,11 @@
        excludeTrash(param);
        convert(param, wrapper);
        allLike(BasDevpErrorLog.class, param.keySet(), wrapper, condition);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        if (Cools.isEmpty(orderByField)) {
            wrapper.orderBy("create_time", false);
        } else {
            wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
        }
        return R.ok(basDevpErrorLogService.selectPage(new Page<>(curr, limit), wrapper));
    }


 src/main/java/com/zy/asrs/controller/BasRgvErrorLogController.java

@@ -32,17 +32,23 @@

    @RequestMapping(value = "/basRgvErrorLog/list/auth")
    @ManagerAuth
    public R list(@RequestParam(defaultValue = "1")Integer curr,
                  @RequestParam(defaultValue = "10")Integer limit,
                  @RequestParam(required = false)String orderByField,
                  @RequestParam(required = false)String orderByType,
                  @RequestParam(required = false)String condition,
                  @RequestParam Map<String, Object> param){
    public R list(@RequestParam(defaultValue = "1") Integer curr,
                  @RequestParam(defaultValue = "10") Integer limit,
                  @RequestParam(required = false) String orderByField,
                  @RequestParam(required = false) String orderByType,
                  @RequestParam(required = false) String condition,
                  @RequestParam Map<String, Object> param) {
        EntityWrapper<BasRgvErrorLog> wrapper = new EntityWrapper<>();
        excludeTrash(param);
        convert(param, wrapper);
        allLike(BasRgvErrorLog.class, param.keySet(), wrapper, condition);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}

        if (Cools.isEmpty(orderByField)) {
            wrapper.orderBy("create_time", false);
        } else {
            wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
        }

        return R.ok(basRgvErrorLogService.selectPage(new Page<>(curr, limit), wrapper));
    }


 src/main/java/com/zy/asrs/entity/result/LocDetlDTO.java

@@ -12,4 +12,6 @@
    private String matnr;
    private Integer owner;
    private Integer payment;
    private String sku;
    private String supp;
}

 src/main/java/com/zy/common/web/WcsController.java

@@ -256,8 +256,7 @@
        }
        return workNo;
    }
    @PostMapping("/auto/、" +
            "TransplantingOut/v1")
    @PostMapping("/auto/TransplantingOut/v1")
    @ResponseBody
    public R autoTransplantingOut(@RequestBody TransplantWork transplantWork){
        // 源站点状态检测

 src/main/resources/mapper/LocDetlMapper.xml

@@ -265,6 +265,12 @@
        <if test="payment != null">
            and t.payment = #{payment}
        </if>
        <if test="sku != null">
            and t.sku = #{sku}
        </if>
        <if test="supp != null">
            and t.supp = #{supp}
        </if>

    </sql>


 src/main/resources/mapper/WrkDetlLogMapper.xml

@@ -51,6 +51,8 @@
        <result column="box_type1" property="boxType1" />
        <result column="box_type2" property="boxType2" />
        <result column="box_type3" property="boxType3" />
        <result column="owner" property="owner"/>
        <result column="uuid" property="uuid"/>
    </resultMap>

    <sql id="batchSeq">

 src/main/resources/mapper/WrkMastMapper.xml

@@ -72,7 +72,7 @@
        or (wrk_sts=15 and take_none = '1' and ove_mk='Y' and wrk_no not in (select wrk_no from asr_bas_devp) and wrk_no not in (select wrk_no from asr_wrk_mast_sta))
        or (wrk_sts=15 and dateadd(mi,3,crn_end_time) &lt;= getdate() and wrk_no not in (select wrk_no from asr_bas_devp))
        or (wrk_sts=15 and crn_end_time is null and wrk_no not in (select wrk_no from asr_bas_devp))
        or (wrk_no in (9997,9996) and wrk_sts = 5)
        or (wrk_no in (9997,9996) and wrk_sts = 15)
        order by io_time,wrk_no asc
    </select>


 src/main/webapp/static/js/pakStore/turnOver.js

@@ -35,14 +35,14 @@
            ,{field: 'loc_no', align: 'center',title: '库位号', sort:true}
            ,{field: 'orderNo', align: 'center',title: '单据编号', hide: true}
            ,{field: 'batch', align: 'center',title: '批号', sort:true}
            ,{field: 'anfme', align: 'center',title: '数量',hide: true}
            ,{field: 'anfme', align: 'center',title: '数量',hide: false}
            ,{field: 'zpallet', align: 'center',title: '托盘条码',hide: false}
            ,{field: 'specs', align: 'center',title: '规格',hide: true}
            ,{field: 'weight', align: 'center',title: '重量', hide: false}
            ,{field: 'weight', align: 'center',title: '重量', hide: true}
            ,{field: 'owner$', align: 'center',title: '货主', hide: false}
            ,{field: 'payment$', align: 'center',title: '货物形态', hide: false}
            ,{field: 'standby1', align: 'center',title: 'po', hide: false}
            ,{field: 'standby2', align: 'center',title: 'upc', hide: false}
            ,{field: 'supp', align: 'center',title: 'po', hide: false}
            ,{field: 'sku', align: 'center',title: 'upc', hide: false}
            ,{field: 'memo', align: 'center',title: '备注', hide: false}
        ]],
        done: function(res, curr, count) {