*

lsh

7 天以前 109e00f8a2b5ec34855816beca6dd59a83eb4f2b

*

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

@@ -113,9 +113,10 @@
    public R query(String condition) {
        EntityWrapper<BasCrnp> wrapper = new EntityWrapper<>();
        wrapper.like("crn_no", condition);
        Page<BasCrnp> page = basCrnpService.selectPage(new Page<>(0, 10), wrapper);
//        Page<BasCrnp> page = basCrnpService.selectPage(new Page<>(0, 10), wrapper);
        List<BasCrnp> basCrnpList = basCrnpService.selectList(wrapper);
        List<Map<String, Object>> result = new ArrayList<>();
        for (BasCrnp basCrnp : page.getRecords()){
        for (BasCrnp basCrnp : basCrnpList){
            Map<String, Object> map = new HashMap<>();
            map.put("id", basCrnp.getCrnNo());
            map.put("value", basCrnp.getCrnNo());

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

@@ -109,9 +109,10 @@
    public R query(String condition) {
        EntityWrapper<BasDevp> wrapper = new EntityWrapper<>();
        wrapper.like("dev_no", condition);
        Page<BasDevp> page = basDevpService.selectPage(new Page<>(0, 10), wrapper);
//        Page<BasDevp> page = basDevpService.selectPage(new Page<>(0, 10), wrapper);
        List<BasDevp> basDevps = basDevpService.selectList(wrapper);
        List<Map<String, Object>> result = new ArrayList<>();
        for (BasDevp basDevp : page.getRecords()){
        for (BasDevp basDevp : basDevps){
            Map<String, Object> map = new HashMap<>();
            map.put("id", basDevp.getDevNo());
            map.put("value", basDevp.getDevNo());

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

@@ -129,9 +129,11 @@
    public R query(String condition) {
        EntityWrapper<BasWrkIotype> wrapper = new EntityWrapper<>();
        wrapper.like("io_desc", condition);
        Page<BasWrkIotype> page = basWrkIotypeService.selectPage(new Page<>(0, 20), wrapper);
//        Page<BasWrkIotype> page = basWrkIotypeService.selectPage(new Page<>(0, 20), wrapper);
        List<BasWrkIotype> basWrkIotypeList = basWrkIotypeService.selectList(wrapper);

        List<Map<String, Object>> result = new ArrayList<>();
        for (BasWrkIotype basWrkIotype : page.getRecords()){
        for (BasWrkIotype basWrkIotype : basWrkIotypeList){
            Map<String, Object> map = new HashMap<>();
            map.put("id", basWrkIotype.getIoType());
            map.put("value", basWrkIotype.getIoDesc());

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

@@ -44,7 +44,11 @@
            wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
        }
        wrapper.orderAsc(Collections.singleton("crn_no"));
        return R.ok(staDescService.selectPage(new Page<>(curr, limit), wrapper));
//        return R.ok(staDescService.selectPage(new Page<>(curr, limit), wrapper));
        List<StaDesc> staDescList = staDescService.selectList(wrapper);
        Page<StaDesc> page = new Page<StaDesc>(0, 10).setRecords(staDescList);
        page.setTotal(staDescList.size());
        return R.ok(page);
    }

    private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){

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

@@ -41,7 +41,11 @@
        EntityWrapper<WrkLastno> wrapper = new EntityWrapper<>();
        convert(param, wrapper);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        return R.ok(wrkLastnoService.selectPage(new Page<>(curr, limit), wrapper));
//        return R.ok(wrkLastnoService.selectPage(new Page<>(curr, limit), wrapper));
        List<WrkLastno> wrkLastnoList = wrkLastnoService.selectList(wrapper);
        Page<WrkLastno> page = new Page<WrkLastno>(0, 10).setRecords(wrkLastnoList);
        page.setTotal(wrkLastnoList.size());
        return R.ok(page);
    }

    private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){

 src/main/java/com/zy/asrs/entity/LocDetl.java

@@ -98,7 +98,8 @@
    private Double weight;

    @ApiModelProperty(value= "长度")
    private Double length;
    @TableField("man_length")
    private Double manLength;

    @ApiModelProperty(value= "体积")
    private Double volume;

 src/main/resources/mapper/LocDetlMapper.xml

@@ -27,7 +27,7 @@
        <result column="ITEM_NUM" property="itemNum" />
        <result column="SAFE_QTY" property="safeQty" />
        <result column="WEIGHT" property="weight" />
        <result column="LENGTH" property="length" />
        <result column="MAN_LENGTH" property="manLength" />
        <result column="VOLUME" property="volume" />
        <result column="THREE_CODE" property="threeCode" />
        <result column="SUPP" property="supp" />

 src/main/resources/mapper/LocMastMapper.xml

@@ -63,31 +63,29 @@
    </sql>

    <select id="selectLocMastListSix" resultMap="BaseResultMap">
        SELECT * FROM "SOURCE"."sys_role"
        SELECT * FROM "SOURCE"."asr_loc_mast"
        WHERE 1=1
        <include refid="batchSeq"></include>
        ORDER BY ID DESC
        LIMIT #{pageSize} OFFSET ((#{pageNumber} - 1) * #{pageSize});
    </select>

    <select id="selectLocMastListTotalSix" resultType="Long">
        SELECT count(1) FROM "SOURCE"."sys_role"
        SELECT count(1) FROM "SOURCE"."asr_loc_mast"
        WHERE 1=1
        <include refid="batchSeq"></include>
    </select>

    <select id="selectLocMastList" resultMap="BaseResultMap">
        SELECT * FROM "SOURCE"."sys_role"
        SELECT * FROM "SOURCE"."asr_loc_mast"
        WHERE 1=1
        <if test="locNo != null and locNo != ''">
            and LOC_NO like '%' + #{locNo} + '%'
        </if>
        ORDER BY ID DESC
        LIMIT #{pageSize} OFFSET ((#{pageNumber} - 1) * #{pageSize});
    </select>

    <select id="selectLocMastListTotal" resultType="Long">
        SELECT count(1) FROM "SOURCE"."sys_role"
        SELECT count(1) FROM "SOURCE"."asr_loc_mast"
        WHERE 1=1
        <if test="locNo != null and locNo != ''">
            and LOC_NO like '%' + #{locNo} + '%'