From b5f108c3ce7c2eec45c57666360909b5da17460b Mon Sep 17 00:00:00 2001 From: x_z Date: Fri, 8 Jul 2022 08:58:56 +0800 Subject: [PATCH] =?UTF-8?q?1.=E9=85=8D=E8=B4=A7=E5=8D=95=E6=8D=AE=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=EF=BC=8C=E5=8D=95=E6=8D=AE=E8=AF=A6=E6=83=85=E6=95=B0?= =?UTF-8?q?=E9=87=8F=E6=B7=BB=E5=8A=A0=E6=A0=A1=E9=AA=8C=202.=E7=A7=BB?= =?UTF-8?q?=E9=99=A4=E6=9C=AA=E4=BD=BF=E7=94=A8=E7=9A=84mybatis=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E7=94=9F=E6=88=90=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inout/StockOrderController.java | 10 +++ .../inout/StockOrderDetailService.java | 8 +++ .../impl/StockOrderDetailServiceImpl.java | 28 +++++++- .../main/resources/mybatis/configuration.xml | 64 ------------------- 4 files changed, 45 insertions(+), 65 deletions(-) delete mode 100644 api-admin/src/main/resources/mybatis/configuration.xml diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderController.java index fc1dccf..6e15c75 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderController.java @@ -1,6 +1,7 @@ package com.glxp.sale.admin.controller.inout; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; import com.glxp.sale.admin.annotation.AuthRuleAnnotation; @@ -156,6 +157,15 @@ public class StockOrderController { stockOrderEntity.setStatus("202");//已配货 } } + + //校验 业务单据配货时实际数量是否允许高于单据数量 + if (CollUtil.isNotEmpty(stockOrderPostRequest.getSubErpOrders())) { + boolean verifyResult = stockOrderDetailService.verifyCount(stockOrderPostRequest.getSubErpOrders()); + if (!verifyResult) { + return ResultVOUtils.error(500, "实际数量不能高于订单数量"); + } + } + if (StringUtils.isBlank(stockOrderEntity.getId())) { BussinessLocalTypeEntity bussinessLocalTypeEntity = bussinessLocalTypeService.findBTByAction(stockOrderEntity.getBillType()); if (StrUtil.isEmpty(stockOrderPostRequest.getBillNo())) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/StockOrderDetailService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/StockOrderDetailService.java index da51fcb..db84b90 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/StockOrderDetailService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/StockOrderDetailService.java @@ -24,4 +24,12 @@ public interface StockOrderDetailService { boolean deleteByOrderIdFk(String id); StockOrderDetailEntity findOne(@Param("id") String id); + + /** + * 校验 业务单据配货时实际数量是否允许高于单据数量 + * + * @param subErpOrders + * @return + */ + boolean verifyCount(List subErpOrders); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/StockOrderDetailServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/StockOrderDetailServiceImpl.java index 706a1bd..ac24067 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/StockOrderDetailServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/StockOrderDetailServiceImpl.java @@ -1,8 +1,11 @@ package com.glxp.sale.admin.service.inout.impl; +import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageHelper; import com.glxp.sale.admin.dao.inout.StockOrderDetailDao; +import com.glxp.sale.admin.dao.param.SystemParamConfigDao; import com.glxp.sale.admin.entity.inout.StockOrderDetailEntity; +import com.glxp.sale.admin.entity.param.SystemParamConfigEntity; import com.glxp.sale.admin.req.inout.StockOrderDetailFilterRequest; import com.glxp.sale.admin.res.inout.StockOrderDetailResponse; import com.glxp.sale.admin.service.inout.StockOrderDetailService; @@ -16,7 +19,9 @@ import java.util.List; public class StockOrderDetailServiceImpl implements StockOrderDetailService { @Resource - StockOrderDetailDao stockOrderDetailDao; + private StockOrderDetailDao stockOrderDetailDao; + @Resource + private SystemParamConfigDao systemParamConfigDao; @Override public List filterStockOrderDetail(StockOrderDetailFilterRequest stockOrderDetailFilterRequest) { @@ -61,6 +66,7 @@ public class StockOrderDetailServiceImpl implements StockOrderDetailService { public boolean deleteById(String id) { return stockOrderDetailDao.deleteById(id); } + @Override public boolean deleteByOrderIdFk(String id) { return stockOrderDetailDao.deleteByOrderIdFk(id); @@ -71,4 +77,24 @@ public class StockOrderDetailServiceImpl implements StockOrderDetailService { return stockOrderDetailDao.findOne(id); } + @Override + public boolean verifyCount(List subErpOrders) { + //查询配置的系统运行参数 + SystemParamConfigEntity config = systemParamConfigDao.selectByParamKey("stock_order_detail_count_max"); + if (null != config) { + //0：允许；1：不允许，允许时不做判断 + if ("1".equals(config.getParamValue())) { + for (StockOrderDetailEntity subErpOrder : subErpOrders) { + if (StrUtil.isNotBlank(subErpOrder.getCount()) && StrUtil.isNotBlank(subErpOrder.getReCount())) { + if (Long.parseLong(subErpOrder.getReCount()) > Long.parseLong(subErpOrder.getCount())) { + return false; + } + } + } + } + return true; + } + return true; + } + } diff --git a/api-admin/src/main/resources/mybatis/configuration.xml b/api-admin/src/main/resources/mybatis/configuration.xml deleted file mode 100644 index cc95ac8..0000000 --- a/api-admin/src/main/resources/mybatis/configuration.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - \ No newline at end of file