#

lsh

2024-07-15 057e2cd464cc8773672ae6ddac7d32eb8cbc3a1f

#

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

@@ -215,17 +215,19 @@
    @ManagerAuth(memo = "出库确认获取信息")
    public R wrkDetlSearchByBatch(@RequestBody String batch){
        if (Cools.isEmpty(batch)){
            return R.error("参数为空");
            return R.error().add("参数为空");
        }
        String[] batch1 = batch.split("箱号：");
        String[] batch2 = batch1[1].split("规格：");
        batch = batch2[0];
//        List<Order> orders = orderService.selectorderNoL(batch);
        WrkDetl wrkDetl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("batch", batch).and().ne("order_no","").and().isNotNull("order_no").orderBy("io_time",false));
        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.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.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("未查到数据");
                return R.error().add("未查到数据");
            }
            wrkDetl = new WrkDetl();
            wrkDetl.sync(wrkDetlLog);
@@ -234,7 +236,7 @@
            wrkDetl.setDeadTime(wrkDetlLog.getDeadTime());
        }
        if (Cools.isEmpty(wrkDetl)){
            return R.error("未查到数据");
            return R.error().add("未查到数据");
        }
        return R.ok().add(wrkDetl);
    }
@@ -242,37 +244,43 @@
    @RequestMapping("/order/search/batch/auth")
    @ManagerAuth(memo = "出库确认")
    public R orderSearchByBatch(@RequestBody String batch){
        if (Cools.isEmpty(batch)){
            return R.error("参数为空");
        }
        String[] batch1 = batch.split("箱号：");
        String[] batch2 = batch1[1].split("规格：");
        batch = batch2[0];
        String orderNo = "";
        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.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("未查到数据");
        try{
            if (Cools.isEmpty(batch)){
                return R.error().add("参数为空");
            }
            orderNo=wrkDetlLog.getOrderNo();
        }else {
            orderNo=wrkDetl.getOrderNo();
        }
            String[] batch1 = batch.split("箱号：");
            String[] batch2 = batch1[1].split("规格：");
            batch = batch2[0];
            String orderNo = "";
//            WrkDetl wrkDetl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("batch", batch).and().ne("order_no","").and().isNotNull("order_no").orderBy("io_time",false));
            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);
                if (Cools.isEmpty(wrkDetlLog)) {
                    return R.error().add("未查到数据:工作明细为空");
                }
                orderNo=wrkDetlLog.getOrderNo();
            }else {
                orderNo=wrkDetl.getOrderNo();
            }
//        List<Order> orders = orderService.selectorderNoL(batch);
        OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("batch", batch).eq("order_no",orderNo));
        if (Cools.isEmpty(orderDetl)){
            return R.error("未查到数据");
            OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("batch", batch).eq("order_no",orderNo));
            if (Cools.isEmpty(orderDetl)){
                return R.error().add("未查到数据:订单明细为空"+orderNo);
            }
            if (!orderDetl.getQty$().equals("已完成")){
                return R.error().add("任务未完成");
            }
            if (orderDetl.getSource()==1){
                return R.error().add("任务已确认，请勿重复确认！！！");
            }
            orderDetl.setSource(1);
            orderDetlService.updateById(orderDetl);
            return R.ok();
        } catch (Exception e){
            return R.error().add(e);
        }
        if (!orderDetl.getQty$().equals("已完成")){
            return R.error("任务未完成");
        }
        if (orderDetl.getSource()==1){
            return R.error("任务已确认，请勿重复确认！！！");
        }
        orderDetl.setSource(1);
        orderDetlService.updateById(orderDetl);
        return R.ok();
    }

//    @RequestMapping("/truss/auth")

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

@@ -1,5 +1,6 @@
package com.zy.asrs.mapper;

import com.zy.asrs.entity.WrkDetl;
import com.zy.asrs.entity.WrkDetlLog;
import com.baomidou.mybatisplus.mapper.BaseMapper;
import org.apache.ibatis.annotations.Insert;
@@ -41,5 +42,7 @@
                                @Param("modiTimeStart") Date modiTimeStart,
                                @Param("modiTimeEnd") Date modiTimeEnd);

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


}

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

@@ -30,5 +30,7 @@

    int updateIoTimeWms(@Param("workNo") Integer workNo, @Param("ioTime") Date ioTime);

    WrkDetl selectWrkDetlByOrderNoNotNull(@Param("batch") String batch);


}

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

@@ -1,5 +1,6 @@
package com.zy.asrs.service;

import com.zy.asrs.entity.WrkDetl;
import com.zy.asrs.entity.WrkDetlLog;
import com.baomidou.mybatisplus.service.IService;

@@ -14,4 +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);

}

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

@@ -26,4 +26,6 @@

    boolean updateIoTimeWms(Integer workNo, Date ioTime);

    WrkDetl selectWrkDetlByOrderNoNotNull(String batch);

}

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

@@ -1,5 +1,6 @@
package com.zy.asrs.service.impl;

import com.zy.asrs.entity.WrkDetl;
import com.zy.asrs.mapper.WrkDetlLogMapper;
import com.zy.asrs.entity.WrkDetlLog;
import com.zy.asrs.service.WrkDetlLogService;
@@ -26,4 +27,9 @@
    public Long selectWrkDetlLogsTotal(Integer wrkNo, String orderNo,String matnr,String specs,String zpallet,String batch,String model,Double anfme, Date modiTimeStart, Date modiTimeEnd) {
        return this.baseMapper.selectWrkDetlLogsTotal(wrkNo, orderNo,matnr,specs,zpallet,batch,model,anfme, modiTimeStart, modiTimeEnd);
    }

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

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

@@ -94,4 +94,9 @@
    public boolean updateIoTimeWms(Integer workNo, Date ioTime) {
        return this.baseMapper.updateIoTimeWms(workNo, ioTime) > 0;
    }

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

 src/main/resources/application.yml

@@ -1,5 +1,5 @@
server:
  port: 8083
  port: 8080
  servlet:
    context-path: /@pom.build.finalName@

@@ -10,15 +10,15 @@
    enabled: false
  datasource:
    driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
#    url: jdbc:sqlserver://192.168.18.4:49977;databasename=srjtasrs
#    username: sa
#    password: sa@123
    url: jdbc:sqlserver://192.168.18.4:49977;databasename=srjtasrs
    username: sa
    password: sa@123
#    url: jdbc:sqlserver://127.0.0.1:49977;databasename=srjtasrs
#    username: sa
#    password: sa@123
    url: jdbc:sqlserver://192.168.4.15:1433;databasename=srjtasrs
    username: sa
    password: sa@123
#    url: jdbc:sqlserver://192.168.4.15:1433;databasename=srjtasrs
#    username: sa
#    password: sa@123
  mvc:
    static-path-pattern: /**
  redis:

 src/main/resources/mapper/WrkDetlLogMapper.xml

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

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

</mapper>

 src/main/resources/mapper/WrkDetlMapper.xml

@@ -137,4 +137,12 @@
        and wrk_no = #{workNo}
    </update>

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

</mapper>