From 6a283d9a076e142debf9460129c01a118d978adf Mon Sep 17 00:00:00 2001 From: x_z Date: Tue, 16 Aug 2022 18:02:30 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9DI=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=EF=BC=8C=E5=A4=9A=E7=BA=A7=E5=8C=85=E8=A3=85?= =?UTF-8?q?=E7=9A=84DI=E5=9D=87=E5=8F=AF=E6=9F=A5=E8=AF=A2=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/api/admin/controller/basic/UdiRelevanceController.java | 2 +- .../com/glxp/api/admin/controller/inout/OrderController.java | 2 +- .../api/admin/service/inventory/impl/InvProductServiceImpl.java | 1 + .../main/resources/mybatis/mapper/inventory/InvProductDao.xml | 1 - 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiRelevanceController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiRelevanceController.java index 0a021076..2cc5d40f 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiRelevanceController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiRelevanceController.java @@ -146,7 +146,7 @@ public class UdiRelevanceController { } } - filterUdiInfoRequest.setDiType(1); + //filterUdiInfoRequest.setDiType(1); udiRelevanceResponses = udiRelevanceService.filterUdiGp(filterUdiInfoRequest); PageInfo pageInfo; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderController.java index 9b4e8489..9c4688b9 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderController.java @@ -31,7 +31,6 @@ import com.glxp.api.admin.service.auth.CustomerService; import com.glxp.api.admin.service.basic.BussinessTypeService; import com.glxp.api.admin.service.basic.EntrustReceService; import com.glxp.api.admin.service.business.StockOrderService; -import com.glxp.api.admin.service.info.CompanyService; import com.glxp.api.admin.service.info.SystemParamConfigService; import com.glxp.api.admin.service.inout.*; import com.glxp.api.admin.service.inventory.InvWarehouseService; @@ -669,6 +668,7 @@ public class OrderController { OrderEntity orderEntity = orderService.findById(orderFilterRequest.getId()); orderEntity.setStatus(ConstantStatus.ORDER_STATUS_PROCESS); orderEntity.setContrastStatus(ConstantStatus.ORDER_CHECK_UN); + orderEntity.setErpFk(""); //将业务单据号置空 List warehouseEntityList = codesService.findByReceiptId(orderEntity.getId()); codesTempService.insertCodesTemp(warehouseEntityList); codesService.deleteByOrderId(orderEntity.getId()); diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvProductServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvProductServiceImpl.java index 11b5c38a..9b246505 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvProductServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvProductServiceImpl.java @@ -42,6 +42,7 @@ public class InvProductServiceImpl implements InvProductService { int offset = (filterInvProductRequest.getPage() - 1) * filterInvProductRequest.getLimit(); PageHelper.offsetPage(offset, filterInvProductRequest.getLimit()); } + List data = invProductDao.filterJoinInvProduct(filterInvProductRequest); return data; } diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDao.xml index fcefc6a4..11d7ed44 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDao.xml @@ -129,7 +129,6 @@ left join inv_warehouse on inv_warehouse.code=inv_product.invStorageCode left join inv_warehouse_sub on inv_warehouse_sub.code = inv_product.invWarehouseCode - basic_products.diType=1 AND basic_products.cpmctymc like concat('%',#{cpmctymc},'%')