From 6d0ab1fa369a259dce26abda1fd52610f2e7fe3b Mon Sep 17 00:00:00 2001 From: anthonyywj2 <353682448@qq.com> Date: Mon, 13 Jun 2022 22:17:13 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/BussinessLocalTypeController.java | 1 + .../basic/EntrustReceController.java | 3 +- .../controller/inout/WareHouseController.java | 27 +++++++++++--- .../service/inout/impl/OrderServiceImpl.java | 35 ++++++++++--------- .../InvPreInProductDetailService.java | 1 + .../InvPreInProductDetailServiceImpl.java | 8 +++++ .../mapper/basic/BussinessLocalTypeDao.xml | 3 +- .../inventory/InvPreProductDetailDao.xml | 2 +- .../mapper/inventory/InvProductDetailDao.xml | 2 +- .../mapper/inventory/InvWarehouseDao.xml | 3 ++ 10 files changed, 59 insertions(+), 26 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessLocalTypeController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessLocalTypeController.java index 17f29a1..9d7fe93 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessLocalTypeController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessLocalTypeController.java @@ -93,6 +93,7 @@ public class BussinessLocalTypeController { if (!customerId.equals(Constant.SYSTEM_CUSTOMER_ID)) { bussinessTypeFilterRequest.setSpUse(true); + } else { bussinessTypeFilterRequest.setUserId(customerService.getUserId()); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/EntrustReceController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/EntrustReceController.java index 2acbe82..b78e293 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/EntrustReceController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/EntrustReceController.java @@ -64,9 +64,8 @@ public class EntrustReceController { @GetMapping("/spms/entrust/rece/filterAllNoUse") - public BaseResponse filterAllNoUse(BasicEntrustRecRequest basicExportStatusRequest) { + public BaseResponse filterAllNoUse(BussinessTypeFilterRequest bussinessTypeFilterRequest) { Integer uerId = customerService.getUserId(); - BussinessTypeFilterRequest bussinessTypeFilterRequest = new BussinessTypeFilterRequest(); bussinessTypeFilterRequest.setUserId(uerId); List bussinessTypeEntities = bussinessTypeService.filterAllByUser(bussinessTypeFilterRequest); return ResultVOUtils.success(bussinessTypeEntities); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java index 2b77118..55f3065 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java @@ -589,14 +589,25 @@ public class WareHouseController { if (StrUtil.isEmpty(udiEntity.getSerialNo()) && StrUtil.isEmpty(udiEntity.getBatchNo())) { return ResultVOUtils.error(500, "批次号不能为空！"); } - + String orderId = addOrderRequest.getOrderId(); // String isCheck = systemParamConfigService.selectValueByParamKey("code_fill_check"); //三期校验 if (addOrderRequest.isCodeFillCheck()) { + BaseResponse checkOriginCodeRes = checkOriginCode(udiEntity); - if (checkOriginCodeRes != null) - return checkOriginCodeRes; + if (checkOriginCodeRes != null) { + if (StrUtil.isNotEmpty(orderId)) { + WarehouseQueryRequest warehouseQueryRequest = new WarehouseQueryRequest(); + warehouseQueryRequest.setOrderId(orderId); + List warehouseEntitys = codesTempService.findByOrderIdAndCode(warehouseQueryRequest); + WarehouseEntity warehouseEntity = isExitLocal(code, warehouseEntitys); + if (warehouseEntity == null) { + return checkOriginCodeRes; + } + } else + return checkOriginCodeRes; + } } @@ -630,8 +641,14 @@ public class WareHouseController { } } } - - String orderId = addOrderRequest.getOrderId(); + if (bussinessTypeEntity.isPreIn()) { + if (StrUtil.isNotEmpty(udiEntity.getSerialNo())) { + List invProductDetailEntities = invPreInProductDetailService.findByOriginCode(code); + if(CollUtil.isNotEmpty(invProductDetailEntities)){ + return ResultVOUtils.error(500, "条码已存在！"); + } + } + } //预验收校验 if (addOrderRequest.isPreCheck()) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java index cdb4f9c..0e53a90 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java @@ -471,15 +471,16 @@ public class OrderServiceImpl implements OrderService { codesDao.deleteByOrderId(id); //查询业务单据 StockOrderFilterRequest stockOrderFilterRequest = new StockOrderFilterRequest(); - stockOrderFilterRequest.setBillNo(orderEntity.getErpFk()); - StockOrderEntity stockOrderEntity = stockOrderDao.findOne(stockOrderFilterRequest); - if (stockOrderEntity != null) { - //删除业务单据详情 - stockOrderDetailDao.deleteByOrderIdFk(stockOrderEntity.getId()); - //删除业务单据 - stockOrderDao.deleteById(stockOrderEntity.getId()); + if (StrUtil.isNotEmpty(orderEntity.getErpFk())) { + stockOrderFilterRequest.setBillNo(orderEntity.getErpFk()); + StockOrderEntity stockOrderEntity = stockOrderDao.findOne(stockOrderFilterRequest); + if (stockOrderEntity != null) { + //删除业务单据详情 + stockOrderDetailDao.deleteByOrderIdFk(stockOrderEntity.getId()); + //删除业务单据 + stockOrderDao.deleteById(stockOrderEntity.getId()); + } } - //删除扫码单据详情 orderDetailDao.deleteByOrderId(id); //删除扫码单据 @@ -495,14 +496,16 @@ public class OrderServiceImpl implements OrderService { orderDao.deleteById(id); orderDetailDao.deleteByOrderId(id); //查询业务单据 - StockOrderFilterRequest stockOrderFilterRequest = new StockOrderFilterRequest(); - stockOrderFilterRequest.setBillNo(orderEntity.getErpFk()); - StockOrderEntity stockOrderEntity = stockOrderDao.findOne(stockOrderFilterRequest); - if (stockOrderEntity != null) { - //删除业务单据详情 - stockOrderDetailDao.deleteByOrderIdFk(stockOrderEntity.getId()); - //删除业务单据 - stockOrderDao.deleteById(stockOrderEntity.getId()); + if (StrUtil.isNotEmpty(orderEntity.getErpFk())) { + StockOrderFilterRequest stockOrderFilterRequest = new StockOrderFilterRequest(); + stockOrderFilterRequest.setBillNo(orderEntity.getErpFk()); + StockOrderEntity stockOrderEntity = stockOrderDao.findOne(stockOrderFilterRequest); + if (stockOrderEntity != null) { + //删除业务单据详情 + stockOrderDetailDao.deleteByOrderIdFk(stockOrderEntity.getId()); + //删除业务单据 + stockOrderDao.deleteById(stockOrderEntity.getId()); + } } //删除码 diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/InvPreInProductDetailService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/InvPreInProductDetailService.java index 8848d9b..08f9bcf 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/InvPreInProductDetailService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/InvPreInProductDetailService.java @@ -7,6 +7,7 @@ import com.glxp.sale.admin.res.inventory.InvProductDetailJoinResponse; import java.util.List; public interface InvPreInProductDetailService { + List findByOriginCode(String code); List filterInvProduct(FilterInvProductDetailRequest filterInvProductDetailRequest); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvPreInProductDetailServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvPreInProductDetailServiceImpl.java index d563802..370b4d1 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvPreInProductDetailServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvPreInProductDetailServiceImpl.java @@ -29,6 +29,14 @@ public class InvPreInProductDetailServiceImpl implements InvPreInProductDetailSe @Resource InvPreInProductDao invPreInProductDao; + @Override + public List findByOriginCode(String code) { + FilterInvProductDetailRequest filterInvProductDetailRequest = new FilterInvProductDetailRequest(); + filterInvProductDetailRequest.setOriginCode(code); + List invProductDetailEntities = invPreInProductDetailDao.filterInvProductDetail(filterInvProductDetailRequest); + return invProductDetailEntities; + } + @Override public List filterInvProduct(FilterInvProductDetailRequest filterInvProductDetailRequest) { if (filterInvProductDetailRequest == null) { diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessLocalTypeDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessLocalTypeDao.xml index 23ae6ae..dc8804a 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessLocalTypeDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessLocalTypeDao.xml @@ -55,7 +55,8 @@ basic_bussiness_type.name , basic_bussiness_type.action,basic_bussiness_type.checkEnable,basic_bustype_local.advanceType,basic_bustype_local.changeEnable, basic_bustype_local.spUse,basic_bussiness_type.storageCode,basic_bussiness_type.corpType,basic_bussiness_type.mainAction - ,basic_bussiness_type.prefix,basic_bustype_local.prefix localPrefix,basic_bustype_local.preIn + ,basic_bussiness_type.prefix,basic_bustype_local.prefix localPrefix,basic_bustype_local.preIn, + basic_bussiness_type.ullageFill, basic_bussiness_type.scanPreIn, basic_bussiness_type.vailInv, basic_bussiness_type.codeFillCheck FROM basic_bustype_local inner join basic_bussiness_type on basic_bustype_local.action = basic_bussiness_type.localAction diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreProductDetailDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreProductDetailDao.xml index 466e6f8..f132688 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreProductDetailDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreProductDetailDao.xml @@ -161,7 +161,7 @@ AND productIdFk = #{productIdFk} - AND inv_product.batchNo like concat('%',#{batchNo},'%') + AND inv_pre_product_detail.batchNo like concat('%',#{batchNo},'%') AND batchNo is NULL diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDetailDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDetailDao.xml index 5b91d1f..6bf7615 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDetailDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDetailDao.xml @@ -161,7 +161,7 @@ AND productIdFk = #{productIdFk} - AND inv_product.batchNo like concat('%',#{batchNo},'%') + AND inv_product_detail.batchNo like concat('%',#{batchNo},'%') AND batchNo is NULL diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InvWarehouseDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/InvWarehouseDao.xml index 645dd58..3c75a68 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvWarehouseDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inventory/InvWarehouseDao.xml @@ -151,6 +151,9 @@ AND pcode = #{pcode} + + AND status = #{status} + AND spUse = #{spUse}