#

lsh

2024-07-15 0ffd698f8e3a92e0f82f16ddad90c2c86f16bfdf

#

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

@@ -224,7 +224,7 @@
        WrkDetl wrkDetl = wrkDetlService.selectWrkDetlByOrderNoNotNull(batch);
//        WrkDetl wrkDetl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("batch", batch).and().ne("order_no","").and().isNotNull("order_no").orderBy("io_time",false));
        if (Cools.isEmpty(wrkDetl)){
            WrkDetlLog wrkDetlLog = wrkDetlLogService.selectWrkDetlByOrderNoNotNull(batch);
            WrkDetlLog wrkDetlLog = wrkDetlLogService.selectWrkDetlLogByOrderNoNotNull(batch);
//            WrkDetlLog wrkDetlLog = wrkDetlLogService.selectOne(new EntityWrapper<WrkDetlLog>().eq("batch", batch).and().ne("order_no","").and().isNotNull("order_no").orderBy("io_time",false));
            if (Cools.isEmpty(wrkDetlLog)){
                return R.error().add("未查到数据");
@@ -256,7 +256,7 @@
            WrkDetl wrkDetl = wrkDetlService.selectWrkDetlByOrderNoNotNull(batch);
            if (Cools.isEmpty(wrkDetl)) {
//                WrkDetlLog wrkDetlLog = wrkDetlLogService.selectOne(new EntityWrapper<WrkDetlLog>().eq("batch", batch).and().ne("order_no","").and().isNotNull("order_no").orderBy("io_time",false));
                WrkDetlLog wrkDetlLog = wrkDetlLogService.selectWrkDetlByOrderNoNotNull(batch);
                WrkDetlLog wrkDetlLog = wrkDetlLogService.selectWrkDetlLogByOrderNoNotNull(batch);
                if (Cools.isEmpty(wrkDetlLog)) {
                    return R.error().add("未查到数据:工作明细为空");
                }

 src/main/java/com/zy/asrs/mapper/WrkDetlLogMapper.java

@@ -42,7 +42,7 @@
                                @Param("modiTimeStart") Date modiTimeStart,
                                @Param("modiTimeEnd") Date modiTimeEnd);

    WrkDetlLog selectWrkDetlByOrderNoNotNull(@Param("batch") String batch);
    WrkDetlLog selectWrkDetlLogByOrderNoNotNull(@Param("batch") String batch);


}

 src/main/java/com/zy/asrs/service/WrkDetlLogService.java

@@ -15,6 +15,6 @@

    Long selectWrkDetlLogsTotal(Integer wrkNo, String orderNo,String matnr,String specs,String zpallet,String batch,String model,Double anfme, Date modiTimeStart, Date modiTimeEnd);

    WrkDetlLog selectWrkDetlByOrderNoNotNull(String batch);
    WrkDetlLog selectWrkDetlLogByOrderNoNotNull(String batch);

}

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

@@ -29,7 +29,7 @@
    }

    @Override
    public WrkDetlLog selectWrkDetlByOrderNoNotNull(String batch) {
        return this.baseMapper.selectWrkDetlByOrderNoNotNull(batch);
    public WrkDetlLog selectWrkDetlLogByOrderNoNotNull(String batch) {
        return this.baseMapper.selectWrkDetlLogByOrderNoNotNull(batch);
    }
}

 src/main/resources/mapper/WrkDetlLogMapper.xml

@@ -106,11 +106,11 @@
        <include refid="batchSeq"></include>
    </select>

    <select id="selectWrkDetlByOrderNoNotNull" resultMap="BaseResultMap">
    <select id="selectWrkDetlLogByOrderNoNotNull" resultMap="BaseResultMap">
        select top 1 * from asr_wrk_detl_log
        where batch = #{batch}
        and order_no is not null
        and order_no != ""
        and order_no != ''
        order by io_time
    </select>


 src/main/resources/mapper/WrkDetlMapper.xml

@@ -141,7 +141,7 @@
        select top 1 * from asr_wrk_detl
        where batch = #{batch}
        and order_no is not null
        and order_no != ""
        and order_no != ''
        order by io_time
    </select>