#

LSH

2023-05-26 0d1b934681464f8e36fa4c62b27bb2d2eb62768b

#

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

@@ -92,11 +92,15 @@
    @ManagerAuth(memo = "手动添加订单")
    @Transactional
    public R formAdd(@RequestBody OrderDomainParam param){
        int payment = 0;
        if(Cools.isEmpty(param.getOrderNo())){
            String prefix = "";
            DocType docType = docTypeService.selectById(param.getDocType());
            if(!Cools.isEmpty(docType)){
                prefix = docType.getPakin() == 1 ? "RK" : "CK";
            }
            if (prefix.equals("CK")){
                payment = 1;
            }
            param.setOrderNo(prefix + snowflakeIdWorker.nextId());
        }
@@ -174,7 +178,7 @@
                orderDetl.setUpdateTime(now);
                orderDetl.setStatus(1);
                orderDetl.setQty(0.0D);
                orderDetl.setPayment(1);
                orderDetl.setPayment(payment);
                orderDetl.setUuid(String.valueOf(System.currentTimeMillis()));
                if (!orderDetlService.insert(orderDetl)) {
                    throw new CoolException("保存订单明细档失败");

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

@@ -27,6 +27,9 @@
    @Data
    public static class CombMat {

        // 单据编号
        private String orderNo;

        // 物料编号
        private String matnr;


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

@@ -95,6 +95,11 @@
                eq("zpallet", param.getBarcode()).eq("io_status", "N")) > 0) {
            throw new CoolException(param.getBarcode() + "数据正在进行入库");
        }
        try{
            param.setOrderNo(param.getCombMats().get(0).getOrderNo());
        }catch (Exception e){

        }

        int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getBarcode()));
        WrkMast wrkMast = wrkMastService.selectByBarcode(param.getBarcode());
@@ -608,7 +613,7 @@
            if (Cools.isEmpty(node, order)) {
                return R.error("参数为空");
            }
            OrderDetl orderDetl = orderDetlService.selectItem(jsonOrderDetl.getOrderNo(),jsonOrderDetl.getMatnr(),jsonOrderDetl.getMaktx());
            OrderDetl orderDetl = orderDetlService.selectItem(jsonOrderDetl.getOrderNo(),jsonOrderDetl.getMatnr(),"");
            if (Cools.isEmpty(orderDetl)) {
                return R.error("单据明细有误,请检查");
            }