订单组托代码

zc

2024-07-29 6d47cee06ff442e5277a6629b2a7350613077029

订单组托代码

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

@@ -150,6 +150,15 @@
    @RequestMapping("/comb/auth")
    @ManagerAuth(memo = "组托")
    public R comb(@RequestBody CombParam combParam) {
        if (Cools.isEmpty(combParam.getOrderNo())) {
            combParam.setOrderNo(combParam.getBillNo());
        }
        List<CombParam.CombMat> combMats = combParam.getCombMats();
        combMats.forEach(elem -> {
            if (Cools.isEmpty(elem.getBatch())) {
                elem.setBatch(elem.getItemBatch());
            }
        });
        System.out.println(combParam);
        mobileService.comb(combParam, getUserId());
        return R.ok("组托成功");
@@ -422,7 +431,7 @@
        System.out.println("-------------------------");
        System.out.println(billNo);
        System.out.println(size);
        List<OrderDetl> waitMatins = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_no", billNo).like("model", size).last("and anfme > work_qty"));
        List<OrderDetl> waitMatins = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("pg_no", billNo).like("model", size).last("and anfme > work_qty"));
//        List<WaitMatin> waitMatins = waitMatinService.selectList(new EntityWrapper<WaitMatin>().eq("bill_no", billNo).last("and qty > in_qty"));

        //如果通知单单号为空，则查询调拨单号

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

@@ -58,13 +58,13 @@
            map.put("desc", siteId + "（全板出库口）");
            result.add(map);
        }
        List<Integer> pickOutSite = basDevpService.getAvailableOutSite(103);
        for (Integer siteId : pickOutSite) {
            Map<String, Object> map = new HashMap<>();
            map.put("siteId", siteId);
            map.put("desc", siteId + "（拣料出库口）");
            result.add(map);
        }
//        List<Integer> pickOutSite = basDevpService.getAvailableOutSite(103);
//        for (Integer siteId : pickOutSite) {
//            Map<String, Object> map = new HashMap<>();
//            map.put("siteId", siteId);
//            map.put("desc", siteId + "（拣料出库口）");
//            result.add(map);
//        }
        return R.ok().add(result);
    }


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

@@ -12,6 +12,9 @@
public class CombParam {

    // 单据编号
    private String billNo;

    // 单据编号
    private String orderNo;

    // 托盘条码
@@ -28,6 +31,10 @@
        // 物料编号
        private String matnr;


        // 序列码
        private String itemBatch;

        // 序列码
        private String batch;


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

@@ -149,7 +149,11 @@
            }
        // 关联组托
        } else {
            Order order = orderService.selectByNo(param.getOrderNo());
            List<OrderDetl> pg_no = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("pg_no", param.getOrderNo()));
            if (pg_no == null || pg_no.isEmpty()) {
                throw new CoolException("单据编号已过期");
            }
            Order order = orderService.selectByNo(pg_no.get(0).getOrderNo());
            if (Cools.isEmpty(order) || order.getSettle() > 2) {
                throw new CoolException("单据编号已过期");
            }
@@ -311,7 +315,9 @@

        // 添加明细
        for (WrkDetl wrkDetl : list) {
            if (wrkDetl.getAnfme() == 0.0D) { continue; }
            if (wrkDetl.getAnfme() == 0.0D) {
                continue;
            }
            // todo 盘点记录、保存调整记录
            String orderNo = wrkDetl.getOrderNo();
            Mat mat = matService.selectByMatnr(wrkDetl.getMatnr());
@@ -425,7 +431,9 @@
                                response,
                                success
                        );
                    } catch (Exception e) { log.error("", e); }
                    } catch (Exception e) {
                        log.error("", e);
                    }
                }

            }
@@ -501,7 +509,8 @@

        BasDevp sta = basDevpService.checkSiteStatus(staNo);
        //根据订单号生成出库任务工作档
        Order order = orderService.selectOne(new EntityWrapper<Order>().eq("order_no", orderNo));
        List<OrderDetl> pg_no = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("pg_no",orderNo));
        Order order = orderService.selectOne(new EntityWrapper<Order>().eq("order_no", pg_no.get(0).getOrderNo()));
        if (order.getSettle() != 1 && order.getSettle() != 2){
            throw new CoolException("该订单已处理");
        }

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

@@ -44,6 +44,7 @@
    @Transactional
    public ReturnT<String> start(WrkMast wrkMast) {
        try {
            System.out.println("-----------------------------------------------------");
            System.out.println(DateUtils.convert(new Date()));
            List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
            // 修改订单状态 作业中 ===>> 已完成