#货主转换，货物形态转换搜索修复

zjj

2023-09-25 404d4ddadf135189b8818c85f58cd0c8c4835913

#货主转换，货物形态转换搜索修复

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

@@ -338,22 +338,30 @@
                  @RequestParam(required = false)String orderByField,
                  @RequestParam(required = false)String orderByType,
                  @RequestParam Map<String, Object> param){
        Integer owner = null;
        Integer payment = null;
        if (param.get("owner$") != null && param.get("owner$") != ""){
            LocOwner locOwner = locOwnerService.selectOne(new EntityWrapper<LocOwner>().eq("owner", param.get("owner$")));
            LocOwner locOwner = locOwnerService.selectOne(new EntityWrapper<LocOwner>().like("owner", (String) param.get("owner$")));
            if(locOwner == null){
                return R.error("参数有误！");
            }
            param.remove("owner$");
            param.put("owner",locOwner.getId());
            owner = locOwner.getId();
        }
        if (param.get("payment$") != null && param.get("payment$") != ""){
            if ( param.get("payment$").equals("仓储") ){
                payment = 1;
            } else if (param.get("payment$").equals("代采")) {
               payment = 0;
            }
            param.remove("payment$");
        }

        LocDetlDTO locDetlDTO = new LocDetlDTO();
        locDetlDTO.setPageSize(limit);
        locDetlDTO.setPageNumber(curr);
        String locNo = String.valueOf(param.get("locNo"));
        String owner = String.valueOf(param.get("owner"));
        String matnr = String.valueOf(param.get("matnr"));
        String payment = String.valueOf(param.get("payment"));
        if (!Cools.isEmpty(locNo) && !locNo.equals("null")) {
            locDetlDTO.setLocNo(locNo);
        }
@@ -381,20 +389,20 @@
                  @RequestParam(required = false)String orderByField,
                  @RequestParam(required = false)String orderByType,
                  @RequestParam Map<String, Object> param){
        Integer owner = null;
        if (param.get("owner$") != null && param.get("owner$") != ""){
            LocOwner locOwner = locOwnerService.selectOne(new EntityWrapper<LocOwner>().eq("owner", param.get("owner$")));
            LocOwner locOwner = locOwnerService.selectOne(new EntityWrapper<LocOwner>().like("owner", (String) param.get("owner$")));
            if(locOwner == null){
                return R.error("参数有误！");
            }
            param.remove("owner$");
            param.put("owner",locOwner.getId());
            owner = locOwner.getId();
        }

        LocDetlDTO locDetlDTO = new LocDetlDTO();
        locDetlDTO.setPageSize(limit);
        locDetlDTO.setPageNumber(curr);
        String locNo = String.valueOf(param.get("locNo"));
        String owner = String.valueOf(param.get("owner"));
        String matnr = String.valueOf(param.get("matnr"));
        if (!Cools.isEmpty(locNo) && !locNo.equals("null")) {
            locDetlDTO.setLocNo(locNo);

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

@@ -16,7 +16,7 @@

    @ApiModelProperty(value= "")
    @TableId(value = "id", type = IdType.AUTO)
    private Long id;
    private Integer id;

    @ApiModelProperty(value= "")
    private String owner;

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

@@ -10,6 +10,6 @@
    private Integer row;
    private String locNo;
    private String matnr;
    private String owner;
    private String payment;
    private Integer owner;
    private Integer payment;
}

 src/main/resources/mapper/LocDetlMapper.xml

@@ -514,10 +514,10 @@
        <if test="matnr != null and matnr !='' ">
            and t.matnr like '%' + #{matnr} + '%'
        </if>
        <if test="owner != null and owner !='' ">
            and t.owner like '%' + #{owner} + '%'
        <if test="owner != null">
            and t.owner =  #{owner}
        </if>
        <if test="payment != null and payment !='' ">
        <if test="payment != null">
            and t.payment = #{payment}
        </if>

@@ -548,6 +548,7 @@
        SELECT * FROM asr_loc_detl_all
        ) t
        WHERE 1=1

        <include refid="selectAllSql"></include>
        ) a
        WHERE a.row BETWEEN ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})

 src/main/webapp/views/pakStore/turnOverQuery.html

@@ -64,7 +64,7 @@
        </div>
        <div class="layui-inline">
            <div class="layui-input-inline">
                <input class="layui-input" type="text" name="payment" placeholder="货物形态" autocomplete="off">
                <input class="layui-input" type="text" name="payment$" placeholder="货物形态" autocomplete="off">
            </div>
        </div>
        <!-- 待添加 -->