管控线边仓库存

pang.jiabao

2 天以前 a1dd6ff24f7cae0b529ad313ba07351c07965605

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

@@ -95,10 +95,10 @@
                    null,    // 物流单号
                    1L,    // 订单状态
                    1,    // 状态
                    9527L,    // 添加人员
                    null,    // 添加人员
                    now,    // 添加时间
                    9527L,    // 修改人员
                    now,    // 修改时间
                    null,    // 修改人员
                    null,    // 修改时间
                    null    // 备注
            );

@@ -110,7 +110,7 @@
            List<DetlDto> list = new ArrayList<>();
            List<DetlDto> orderDetails = param.getOrderDetails();
            for (DetlDto detail : orderDetails) {
                DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getAnfme());
                DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getAnfme(),detail.getSourceLoc(), detail.getStaLoc(),detail.getSku());
                if (DetlDto.has(list, dto)) {
                    DetlDto detlDto = DetlDto.find(list, dto.getMatnr(), dto.getBatch());
                    assert detlDto != null;
@@ -133,10 +133,12 @@
                orderDetl.setOrderId(order.getId());
                orderDetl.setOrderNo(order.getOrderNo());
                orderDetl.setSku(detlDto.getSku()); // 单行号，u8明细id,上报需要
                orderDetl.setCreateBy(9527L);
                orderDetl.setSupp(detlDto.getSourceLoc());
                orderDetl.setSuppCode(detlDto.getStaLoc());
//                orderDetl.setCreateBy(9527L);
                orderDetl.setCreateTime(now);
                orderDetl.setUpdateBy(9527L);
                orderDetl.setUpdateTime(now);
//                orderDetl.setUpdateBy(9527L);
//                orderDetl.setUpdateTime(now);
                orderDetl.setStatus(1);
                orderDetl.setQty(0.0D);
                if (!orderDetlService.insert(orderDetl)) {
@@ -219,6 +221,9 @@
        Order order = orderService.selectByNo(orderNo);

        if (optType.equals("add")) {
            if (!Cools.isEmpty(order)) {
                throw new CoolException(orderNo + "单据已存在，请勿重复提交");
            }
            DocType docType = docTypeService.selectOrAdd(orderType, Boolean.FALSE);
            Date now = new Date();
            // 单据主档
@@ -252,10 +257,10 @@
                    null,    // 物流单号
                    1L,    // 订单状态
                    1,    // 状态
                    9527L,    // 添加人员
                    null,    // 添加人员
                    now,    // 添加时间
                    9527L,    // 修改人员
                    now,    // 修改时间
                    null,    // 修改人员
                    null,    // 修改时间
                    null    // 备注
            );
            if (!orderService.insert(order)) {
@@ -265,7 +270,7 @@
            List<DetlDto> list = new ArrayList<>();
            List<DetlDto> orderDetails = param.getOrderDetails();
            for (DetlDto detail : orderDetails) {
                DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getAnfme());
                DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getAnfme(),detail.getSourceLoc(),detail.getStaLoc(),detail.getSku());
                if (DetlDto.has(list, dto)) {
                    DetlDto detlDto = DetlDto.find(list, dto.getMatnr(), dto.getBatch());
                    assert detlDto != null;
@@ -286,10 +291,12 @@
                orderDetl.setOrderId(order.getId());
                orderDetl.setOrderNo(order.getOrderNo());
                orderDetl.setSku(detlDto.getSku()); // 单行号，u8明细id,上报需要
                orderDetl.setCreateBy(9527L);
                orderDetl.setSupp(detlDto.getSourceLoc());
                orderDetl.setSuppCode(detlDto.getStaLoc());
//                orderDetl.setCreateBy(9527L);
                orderDetl.setCreateTime(now);
                orderDetl.setUpdateBy(9527L);
                orderDetl.setUpdateTime(now);
//                orderDetl.setUpdateBy(9527L);
//                orderDetl.setUpdateTime(now);
                orderDetl.setStatus(1);
                orderDetl.setQty(0.0D);
                if (!orderDetlService.insert(orderDetl)) {