From c2bb2dc2ae00d9a05d3187009c5118058e3da56c Mon Sep 17 00:00:00 2001 From: x_z Date: Tue, 29 Nov 2022 17:39:04 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E6=8F=90=E4=BA=A4=E5=8D=95?= =?UTF-8?q?=E6=8D=AE=E5=88=B0=E8=87=AA=E5=8A=A9=E5=B9=B3=E5=8F=B0=E6=8E=A7?= =?UTF-8?q?=E5=88=B6=E5=AD=97=E6=AE=B5=E7=BC=BA=E5=A4=B1=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/StockOrderController.java | 6 ++++-- .../admin/dao/inout/UnitMaintainPlatformDao.java | 2 ++ .../api/admin/res/inout/StockOrderResponse.java | 3 +++ .../api/admin/service/inout/OrderService.java | 8 ++++++++ .../service/inout/impl/OrderServiceImpl.java | 16 ++++++++++++---- .../mapper/inout/UnitMaintainPlatformDao.xml | 6 ++++++ 6 files changed, 35 insertions(+), 6 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderController.java index 7ef1be6a..3ea90f51 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderController.java @@ -32,7 +32,9 @@ import com.glxp.api.admin.req.business.StockOrderIdsRequest; import com.glxp.api.admin.req.business.StockOrderPostRequest; import com.glxp.api.admin.req.inout.AddStockOrderChangeRequest; import com.glxp.api.admin.req.inout.DeleteRequest; -import com.glxp.api.admin.req.inventory.*; +import com.glxp.api.admin.req.inventory.FilterInvUserRequest; +import com.glxp.api.admin.req.inventory.InnerOrderDetailRequest; +import com.glxp.api.admin.req.inventory.PostStockPrintRequest; import com.glxp.api.admin.res.PageSimpleResponse; import com.glxp.api.admin.res.basic.UdiRelevanceResponse; import com.glxp.api.admin.res.business.StockOrderExportResponse; @@ -48,7 +50,6 @@ import com.glxp.api.admin.service.business.StockOrderDetailService; import com.glxp.api.admin.service.business.StockOrderDetailTempService; import com.glxp.api.admin.service.business.StockOrderService; import com.glxp.api.admin.service.business.StockQRCodeTextService; -import com.glxp.api.admin.service.info.CompanyService; import com.glxp.api.admin.service.info.SystemParamConfigService; import com.glxp.api.admin.service.inout.CodesService; import com.glxp.api.admin.service.inout.CodesTempService; @@ -329,6 +330,7 @@ public class StockOrderController { //查询仓库名称 orderService.queryInvName(resultList); resultList = orderService.checkSubmitOrder(resultList); + orderService.setUploadFlag(resultList); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(resultList); diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inout/UnitMaintainPlatformDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/inout/UnitMaintainPlatformDao.java index 3a884e67..11b3904d 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/inout/UnitMaintainPlatformDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/inout/UnitMaintainPlatformDao.java @@ -38,4 +38,6 @@ public interface UnitMaintainPlatformDao{ UnitMaintainPlatformEntity findLinkData(@Param("customerId") long customerId, @Param("action") String action, @Param("unitId") String unitId); void deleteById(String id); + + Long selectCount(@Param("action") String action); } \ No newline at end of file diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/inout/StockOrderResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/inout/StockOrderResponse.java index 1e2282d8..999f9a73 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/inout/StockOrderResponse.java +++ b/api-admin/src/main/java/com/glxp/api/admin/res/inout/StockOrderResponse.java @@ -21,4 +21,7 @@ public class StockOrderResponse extends StockOrderEntity { //当前分库名称 private String invWarehouseName; + //单据是否可以上传 + private boolean uploadFlag; + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inout/OrderService.java b/api-admin/src/main/java/com/glxp/api/admin/service/inout/OrderService.java index 39e60545..1dd713f3 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inout/OrderService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inout/OrderService.java @@ -136,4 +136,12 @@ public interface OrderService { * @param responseList */ void queryInvName(List responseList); + + /** + * + * 设置单据上传状态 + * @param resultList + */ + void setUploadFlag(List resultList); + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/OrderServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/OrderServiceImpl.java index 1b9124a6..47c0b9eb 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/OrderServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/OrderServiceImpl.java @@ -13,10 +13,7 @@ import com.glxp.api.admin.dao.basic.BussinessLocalTypeDao; import com.glxp.api.admin.dao.basic.BussinessTypeDao; import com.glxp.api.admin.dao.business.StockOrderDao; import com.glxp.api.admin.dao.business.StockOrderDetailDao; -import com.glxp.api.admin.dao.inout.CodesDao; -import com.glxp.api.admin.dao.inout.CodesTempDao; -import com.glxp.api.admin.dao.inout.OrderDao; -import com.glxp.api.admin.dao.inout.OrderDetailDao; +import com.glxp.api.admin.dao.inout.*; import com.glxp.api.admin.dao.inventory.*; import com.glxp.api.admin.entity.basic.BasicThirdSysBusApiEntity; import com.glxp.api.admin.entity.basic.BussinessTypeEntity; @@ -90,6 +87,8 @@ public class OrderServiceImpl implements OrderService { private InvPreInProductDao invPreInProductDao; @Resource private InvPreInProductDetailDao invPreInProductDetailDao; + @Resource + private UnitMaintainPlatformDao unitMaintainPlatformDao; @Override public List listOrders(OrderQueryRequest orderQueryRequest) { @@ -502,6 +501,15 @@ public class OrderServiceImpl implements OrderService { } } + @Override + public void setUploadFlag(List resultList) { + for (StockOrderResponse stockOrderResponse : resultList) { + Long count = unitMaintainPlatformDao.selectCount(stockOrderResponse.getBillType()); + stockOrderResponse.setUploadFlag(count > 0 ? true : false); + } + + } + @Transactional(rollbackFor = Exception.class) @Override public void deleteOrders(List ids) { diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/UnitMaintainPlatformDao.xml b/api-admin/src/main/resources/mybatis/mapper/inout/UnitMaintainPlatformDao.xml index 8efe4521..cd40715e 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inout/UnitMaintainPlatformDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inout/UnitMaintainPlatformDao.xml @@ -130,4 +130,10 @@ delete from io_unit_maintain_platform where id = #{id} + + \ No newline at end of file