#

zjj

2024-11-09 c48e244fdc73ca83db1d8ea0c418b70125d4cab1

#

 src/main/java/com/zy/asrs/entity/param/CombParam.java

@@ -41,6 +41,8 @@

        private Double weight;

        private String memo;

    }

}

 src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java

@@ -134,6 +134,7 @@
            List<DetlDto> detlDtos = new ArrayList<>();
            param.getCombMats().forEach(elem -> {
                DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(),elem.getWeight());
                detlDto.setMemo(elem.getMemo());
                if (DetlDto.has(detlDtos, detlDto)) {
                    DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch());
                    assert one != null;
@@ -165,6 +166,7 @@
                waitPakin.setOwner(detlDto.getOwner());
                waitPakin.setUuid(uuid);
                waitPakin.setWeight(detlDto.getWeight());
                waitPakin.setMemo(detlDto.getMemo());
                if (!waitPakinService.insert(waitPakin)) {
                    throw new CoolException("保存入库通知档失败");
                }
@@ -245,6 +247,7 @@
                waitPakin.setPayment(detlDto.getPayment());
                waitPakin.setUuid(uuid);
                waitPakin.setWeight(detlDto.getWeight());
                waitPakin.setMemo(detlDto.getMemo());
                if (!waitPakinService.insert(waitPakin)) {
                    throw new CoolException("保存入库通知档失败");
                }

 src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java

@@ -102,6 +102,9 @@
            if (!wrkMastService.deleteById(wrkMast)) {
                exceptionHandle("删除工作主档[workNo={0}]失败", wrkMast.getWrkNo());
            }
            if (wrkMast.getIoType()==199){
                return SUCCESS;
            }
            // 保存工作明细档历史档
            if (!wrkDetlLogService.save(wrkMast.getWrkNo())) {
//                exceptionHandle("保存工作明细历史档[workNo={0}]失败", wrkMast.getWrkNo());

 src/main/java/com/zy/common/model/DetlDto.java

@@ -28,6 +28,7 @@
    private int payment;

    private Double weight;
    private String memo;

    private String sourceLocName;//源仓库
    private String targetLocName;//目标仓库

 src/main/resources/mapper/LocDetlMapper.xml

@@ -110,7 +110,7 @@
            and a.owner =  #{owner}
        </if>
        <if test="batch !=null and batch!='' ">
            and a.batch like  #{batch}
            and a.batch like  '%' + #{batch} + '%'
        </if>
    </sql>


 src/main/resources/mapper/WrkMastMapper.xml

@@ -72,6 +72,7 @@
        or (wrk_sts=15 and ove_mk='Y' and wrk_no not in (select wrk_no from asr_bas_devp))
        or (wrk_sts=15 and dateadd(mi,15,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_sts=105
        order by io_time,wrk_no asc
    </select>
    <select id="checkFinishByOrder" resultType="java.lang.Integer">