diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingStorageServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingStorageServiceImpl.java index 95373b12..9ad28422 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingStorageServiceImpl.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingStorageServiceImpl.java @@ -1173,7 +1173,6 @@ public class WarehousingStorageServiceImpl extends ServiceImpl userIPage; if(StringUtil.equals(warehousingStoragePagination.getType(), "1")){ diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/BusinessOrderController.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/BusinessOrderController.java index f087b14c..d5794857 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/BusinessOrderController.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/BusinessOrderController.java @@ -854,7 +854,6 @@ public class BusinessOrderController { businessOrderQueryWrapper.isNull("a.f_delete_mark"); businessOrderQueryWrapper.inSql("a.id", "SELECT f_process_id FROM flow_task WHERE f_status = '2'");//通过审核的订单 businessOrderQueryWrapper.like("a.organize_json_id",organize); -// businessOrderQueryWrapper.eq("a.yunguan_mark","Y"); List businessOrderEntityList = businessOrderService.saleOrderByDeliveryOrderInfo(businessOrderQueryWrapper); // List> realList=new ArrayList<>(); for (BusinessOrderEntity entity: businessOrderEntityList) { @@ -960,7 +959,6 @@ public class BusinessOrderController { businessOrderQueryWrapper.isNull("a.f_delete_mark"); businessOrderQueryWrapper.inSql("a.id", "SELECT f_process_id FROM flow_task WHERE f_status = '2'");//通过审核的订单 businessOrderQueryWrapper.like("a.organize_json_id",organize); -// businessOrderQueryWrapper.eq("a.yunguan_mark","Y"); List businessOrderEntityList = businessOrderService.purchaseOrderByReceiptOrderInfo(businessOrderQueryWrapper); // List> realList=new ArrayList<>(); for (BusinessOrderEntity entity: businessOrderEntityList) {