| src/main/java/com/zy/asrs/entity/param/OpenOrderPakinParam.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/entity/param/OpenOrderPakoutParam.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/zy/asrs/entity/param/OpenOrderPakinParam.java
@@ -16,6 +16,8 @@ private String orderType; private String orderTime; private String standby1 = "1"; private Long ownerId = 1L; private List<DetlDto> orderDetails;
@@ -20,6 +20,8 @@ private String orderType; private String orderTime; private String standby1 = "1"; private Long ownerId = 1L; private List<DetlDto> orderDetails;
@@ -608,9 +608,9 @@ waitPakin.setStandby1(detlDto.getStandby1()); waitPakin.setStandby2(detlDto.getStandby2()); waitPakin.setStandby3(detlDto.getStandby3()); waitPakin.setStandby1(detlDto.getStandby1()); waitPakin.setStandby2(detlDto.getStandby2()); waitPakin.setStandby3(detlDto.getStandby3()); waitPakin.setBoxType1(detlDto.getBoxType1()); waitPakin.setBoxType2(detlDto.getBoxType2()); waitPakin.setBoxType3(detlDto.getBoxType3()); if (!waitPakinService.insert(waitPakin)) { throw new CoolException("保存入库通知档失败"); } @@ -669,9 +669,9 @@ waitPakin.setStandby1(detlDto.getStandby1()); waitPakin.setStandby2(detlDto.getStandby2()); waitPakin.setStandby3(detlDto.getStandby3()); waitPakin.setStandby1(detlDto.getStandby1()); waitPakin.setStandby2(detlDto.getStandby2()); waitPakin.setStandby3(detlDto.getStandby3()); waitPakin.setBoxType1(detlDto.getBoxType1()); waitPakin.setBoxType2(detlDto.getBoxType2()); waitPakin.setBoxType3(detlDto.getBoxType3()); if (!waitPakinService.insert(waitPakin)) { throw new CoolException("保存入库通知档失败"); } src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -60,6 +60,8 @@ private BasArmMastSignService basArmMastSignService; @Autowired private BasAgvMastService basAgvMastService; @Autowired private LocOwnerService locOwnerService; @Override @Transactional @@ -70,6 +72,12 @@ } DocType docType = docTypeService.selectOrAdd(param.getOrderType(), Boolean.TRUE); Date now = new Date(); LocOwner locOwner = null; if (!Cools.isEmpty(param.getOwnerId())) { locOwner = locOwnerService.selectById(param.getOwnerId()); } else { locOwner = locOwnerService.selectById(1); } // 单据主档 order = new Order( String.valueOf(snowflakeIdWorker.nextId()), // 编号[非空] @@ -77,12 +85,12 @@ DateUtils.convert(now), // 单据日期 docType.getDocId(), // 单据类型 null, // 项目编号 null, // param.getStandby1(), //项目名称 客户PO号 null, // 调拨项目编号 null, // 初始票据号 null, // 票据号 null, // 客户编号 null, // 客户 locOwner.getOwnerUuid(), // 客户编号 locOwner.getOwner(), // 客户 null, // 联系方式 null, // 操作人员 null, // 合计金额 @@ -138,6 +146,9 @@ orderDetl.setStandby1(detlDto.getStandby1()); orderDetl.setStandby2(detlDto.getStandby2()); orderDetl.setStandby3(detlDto.getStandby3()); orderDetl.setBoxType1(detlDto.getBoxType1()); orderDetl.setBoxType2(detlDto.getBoxType2()); orderDetl.setBoxType3(detlDto.getBoxType3()); orderDetl.setOrderId(order.getId()); orderDetl.setOrderNo(order.getOrderNo()); orderDetl.setCreateBy(9527L); @@ -230,6 +241,12 @@ } DocType docType = docTypeService.selectOrAdd(param.getOrderType(), Boolean.FALSE); Date now = new Date(); LocOwner locOwner = null; if (!Cools.isEmpty(param.getOwnerId())) { locOwner = locOwnerService.selectById(param.getOwnerId()); } else { locOwner = locOwnerService.selectById(1); } // 单据主档 order = new Order( String.valueOf(snowflakeIdWorker.nextId()), // 编号[非空] @@ -237,12 +254,12 @@ DateUtils.convert(now), // 单据日期 docType.getDocId(), // 单据类型 null, // 项目编号 null, // param.getStandby1(), //项目名称 客户PO号 null, // 调拨项目编号 null, // 初始票据号 null, // 票据号 null, // 客户编号 null, // 客户 locOwner.getOwnerUuid(), // 客户编号 locOwner.getOwner(), // 客户 null, // 联系方式 null, // 操作人员 null, // 合计金额 @@ -300,6 +317,9 @@ orderDetl.setStandby1(detlDto.getStandby1()); orderDetl.setStandby2(detlDto.getStandby2()); orderDetl.setStandby3(detlDto.getStandby3()); orderDetl.setBoxType1(detlDto.getBoxType1()); orderDetl.setBoxType2(detlDto.getBoxType2()); orderDetl.setBoxType3(detlDto.getBoxType3()); orderDetl.setOrderId(order.getId()); orderDetl.setOrderNo(order.getOrderNo()); orderDetl.setCreateBy(9527L); src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java
@@ -63,6 +63,9 @@ @Autowired private SnowflakeIdWorker snowflakeIdWorker; @Autowired private LocOwnerService locOwnerService; @Transactional public synchronized ReturnT<String> start() { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); @@ -175,6 +178,12 @@ docType.setCreateTime(jsonDate); Order order = OrderInAndOutUtil.selectByNo(kingDeeUtilType.pakIn == 1, jsonArray.get(0).toString()); // Order order = orderService.selectByNo(jsonArray.get(0).toString()); LocOwner locOwner = null; if (!Cools.isEmpty(1)) { locOwner = locOwnerService.selectById(1); } else { locOwner = locOwnerService.selectById(1); } if (Cools.isEmpty(order)) { Date now = new Date(); // 单据主档 @@ -184,12 +193,12 @@ DateUtils.convert(now), // 单据日期 docType.getDocId(), // 单据类型 null, // 项目编号 null, // "1", //项目名称 客户PO号 null, // 调拨项目编号 null, // 初始票据号 null, // 票据号 null, // 客户编号 null, // 客户 locOwner.getOwnerUuid(), // 客户编号 locOwner.getOwner(), // 客户 null, // 联系方式 null, // 操作人员 null, // 合计金额
