123

zhang

2 天以前 cca40ca8d275faa8b5cc9501ce4f09b81cfbd7fc

123

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

@@ -217,7 +217,7 @@
                    }
                    combParam.setCombMats(combMats);
                }
                combParam.setOrderNo(order.getOrderNo());
                //combParam.setOrderNo(order.getOrderNo());
                combParams.add(combParam);
            }
        }
@@ -243,6 +243,7 @@
        matParam.setOrderNo(nccJcQilibcBarcodeflowWms.getZkdh());
        matParam.setBatch(nccJcQilibcBarcodeflowWms.getVbatchcode());
        matParam.setAnfme(nccJcQilibcBarcodeflowWms.getAsnnum() == null ? 0.0D : nccJcQilibcBarcodeflowWms.getAsnnum().doubleValue());
        matParam.setAnfme2(nccJcQilibcBarcodeflowWms.getNastnum() == null ? 0.0D : nccJcQilibcBarcodeflowWms.getNastnum().doubleValue());
        return R.ok().add(matParam);
    }


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

@@ -11,7 +11,7 @@
public class CombParam {

    // 单据编号
    private String orderNo;
    //private String orderNo;

    // 托盘条码
    private String barcode;

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

@@ -17,6 +17,10 @@
    /**
     * 商品编号
     */
    private double anfme2;
    /**
     * 商品编号
     */
    private String batch;
    /**
     * 商品编号

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

@@ -573,7 +573,7 @@
        Date now = new Date();

        // 无单组托
        if (Cools.isEmpty(param.getOrderNo()) && Cools.isEmpty(param.getCombMats().get(0).getOrderNo())) {
        if (Cools.isEmpty(param.getCombMats().get(0).getOrderNo())) {

            // 生成入库通知档
            List<DetlDto> detlDtos = new ArrayList<>();

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

@@ -229,12 +229,14 @@
        Order order = orderService.selectByNo(param.getOrderNo());
        // 如果单据不存在则添加；如果单据存在，作业中无法修改，反之则修改单据
        if (!Cools.isEmpty(order)) {
            if (order.getSettle() > 1L) {
                throw new CoolException(param.getOrderNo() + "正在出库，无法修改单据");
            OrderPakout orderPakout = orderPakoutService.selectByNo(param.getOrderNo());
            if (!Cools.isEmpty(orderPakout)) {
                if (orderPakout.getSettle() > 1L) {
                    throw new CoolException(param.getOrderNo() + "正在出库，无法修改单据");
                }
                orderPakoutService.remove(orderPakout.getId());
            }
            orderService.remove(order.getId());
            OrderPakout orderPakout = orderPakoutService.selectByNo(param.getOrderNo());
            orderPakoutService.remove(orderPakout.getId());
        }
        DocType docType = docTypeService.selectOrAdd(param.getOrderType(), Boolean.FALSE);
        Date now = new Date();