#补丁

Administrator

2023-10-07 ceeac33daaa44f605e2bd5a9c443c9438795be0d

#补丁

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

@@ -419,14 +419,15 @@


            if (!Cools.isEmpty(mat.getStoreMaxDate())) {
                if (Cools.isEmpty(locDetl.getBatch())) {
                    continue;
                } else if (locDetl.getBatch().length() != 8) {
                    continue;
                }
//                if (Cools.isEmpty(locDetl.getBatch())) {
//                    continue;
//                } else if (locDetl.getBatch().length() != 8) {
//                    continue;
//                }
                try {
                    SimpleDateFormat simple = new SimpleDateFormat("yyyyMMdd");
                    Date maxDate = simple.parse(locDetl.getBatch());
//                    SimpleDateFormat simple = new SimpleDateFormat("yyyyMMdd");
//                    Date maxDate = simple.parse(locDetl.getBatch());
                    Date maxDate = locDetl.getModiTime();
                    Calendar calendar = new GregorianCalendar();
                    calendar.setTime(maxDate);
                    // 把日期往后增加一天,整数  往后推,负数往前移动
@@ -443,7 +444,7 @@
                    abnormalLocDetlParam.setSpecs(mat.getSpecs());
                    abnormalLocDetlParam.setBatch(locDetl.getBatch());
                    if (now.compareTo(maxDate) > 0) {
                        long difference = (now.getTime() - maxDate.getTime()) / (24 * 60 * 60 * 1000);
                        long difference = (now.getTime() - locDetl.getModiTime().getTime()) / (24 * 60 * 60 * 1000);
                        abnormalLocDetlParam.setNowTime(Integer.parseInt(String.valueOf(difference)));
                        result.add(abnormalLocDetlParam);
                    }

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

@@ -348,7 +348,6 @@
                  @RequestParam(required = false)String orderByType,
                  @RequestParam Map<String, Object> param){
        EntityWrapper<OrderLog> wrapper = new EntityWrapper<>();
        wrapper.orderBy("create_time");
        excludeTrash(param);
        convert(param, wrapper);
        if (!Cools.isEmpty(orderByField)){

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

@@ -431,9 +431,13 @@
            if (wrkDetls.get(0).getOrderNo() != null) {
                for (WrkDetl wrkDetl : wrkDetls) {
                    String orderNo$ = "";
                    JSON.parseArray(wrkDetl.getOrderNo(), DetlDto.class).forEach(detlDto -> {
                        resultRecords.add(detlDto.getOrderNo());
                    });
                    if(!wrkDetl.getOrderNo().startsWith("[") || !wrkDetl.getOrderNo().endsWith("]")) {
                        return wrkDetl.getOrderNo();
                    } else {
                        JSON.parseArray(wrkDetl.getOrderNo(), DetlDto.class).forEach(detlDto -> {
                            resultRecords.add(detlDto.getOrderNo());
                        });
                    }
                }

            }

 src/main/java/com/zy/asrs/utils/Utils.java

@@ -488,8 +488,8 @@
                    add(zerofill(String.valueOf(3), 2) + locNo.substring(2));
                }};
            case 3:
                return new ArrayList<>();
            case 4:
                return new ArrayList<>();
            case 5:
                return new ArrayList<String>() {{
                    add(zerofill(String.valueOf(4), 2) + locNo.substring(2));
@@ -521,8 +521,8 @@
                    add(zerofill(String.valueOf(11), 2) + locNo.substring(2));
                }};
            case 11:
                return new ArrayList<>();
            case 12:
                return new ArrayList<>();
            case 13:
                return new ArrayList<String>() {{
                    add(zerofill(String.valueOf(12), 2) + locNo.substring(2));
@@ -548,8 +548,8 @@
                    add(zerofill(String.valueOf(18), 2) + locNo.substring(2));
                }};
            case 18:
                return new ArrayList<>();
            case 19:
                return new ArrayList<>();
            case 20:
                return new ArrayList<String>() {{
                    add(zerofill(String.valueOf(19), 2) + locNo.substring(2));

 src/main/resources/mapper/LocDetlMapper.xml

@@ -201,11 +201,11 @@
        , a.loc_no as locNo
        , a.batch
        , a.anfme
        , a.modi_time as modiTime
        from asr_loc_detl a
        where 1=1
        and batch!='' and batch is not null
        <include refid="stockOutCondition"></include>
        group by a.matnr,a.batch,a.anfme, a.loc_no
        group by a.matnr,a.batch,a.anfme, a.loc_no, a.modi_time
        ) t where t.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
    </select>


 src/main/webapp/views/locOwner/locOwner.html

@@ -29,7 +29,7 @@
<!--                    </div>-->
                    <div class="layui-inline">
                        <div class="layui-input-inline">
                            <input class="layui-input" type="text" name="condition" placeholder="请输入" autocomplete="off">
                            <input class="layui-input" type="text" name="owner" placeholder="请输入" autocomplete="off">
                        </div>
                    </div>
                    <div class="layui-inline">&emsp;
@@ -73,7 +73,7 @@
        <div class="layui-row">
            <div class="layui-col-md12">
                <div class="layui-form-item">
                    <label class="layui-form-label layui-form-required">: </label>
                    <label class="layui-form-label layui-form-required">客户信息: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="owner" placeholder="请输入" lay-vertype="tips" lay-verify="required">
                    </div>