diff --git a/src/main/java/com/glxp/udi/admin/entity/inout/OrderEntity.java b/src/main/java/com/glxp/udi/admin/entity/inout/OrderEntity.java index 16cf988..4b84530 100644 --- a/src/main/java/com/glxp/udi/admin/entity/inout/OrderEntity.java +++ b/src/main/java/com/glxp/udi/admin/entity/inout/OrderEntity.java @@ -45,8 +45,10 @@ public class OrderEntity { /** * 上传到自助平台状态 + * + * 上传状态(0:未上传,1:已上传) */ - private String uploadStatus; //上传状态(0:未上传,1:已上传) + private String uploadStatus; private Long customerId; diff --git a/src/main/java/com/glxp/udi/admin/service/inout/OrderService.java b/src/main/java/com/glxp/udi/admin/service/inout/OrderService.java index 19ff2fa..8b5f223 100644 --- a/src/main/java/com/glxp/udi/admin/service/inout/OrderService.java +++ b/src/main/java/com/glxp/udi/admin/service/inout/OrderService.java @@ -232,7 +232,6 @@ public class OrderService { //更新数据 try { - supplementOrder.setOrderId(null); insertOrder(supplementOrder); //更新配货单表对应的单据补单号 orderEntity.setSupplementNo(supplementOrderNo); @@ -252,7 +251,8 @@ public class OrderService { public List getSupplementOrderBillNoList() { //查询补单单号为空,且单据状态为已完成的单据 QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.isNull("supplementNo").eq("status", ConstantStatus.ORDER_STATUS_SUCCESS); + wrapper.isNull("supplementNo").eq("status", ConstantStatus.ORDER_STATUS_SUCCESS) + .ne("receiveStatus", ConstantStatus.RECEIVE_UN); return orderDao.selectList(wrapper); } diff --git a/src/main/java/com/glxp/udi/admin/service/inout/WarehouseService.java b/src/main/java/com/glxp/udi/admin/service/inout/WarehouseService.java index adc5ae4..395c979 100644 --- a/src/main/java/com/glxp/udi/admin/service/inout/WarehouseService.java +++ b/src/main/java/com/glxp/udi/admin/service/inout/WarehouseService.java @@ -93,7 +93,7 @@ public class WarehouseService { } public List findByOrderId(String orderId) { - if (StrUtil.isNotBlank(orderId)) { + if (StrUtil.isBlank(orderId)) { return Collections.emptyList(); } return codesDao.selectByOrderId(orderId);