From 1125e6fd3f767340406940059fc577ed173c67a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Wed, 7 Dec 2022 10:18:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B91.2=E7=BA=A7=E7=A8=8B?= =?UTF-8?q?=E5=BA=A6bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inout/StockOrderDetailController.java | 33 +++++++++++- .../controller/inout/WareHouseController.java | 7 ++- .../glxp/sale/admin/dao/basic/UdiInfoDao.java | 2 + .../admin/service/basic/UdiInfoService.java | 2 + .../basic/impl/UdiInfoServiceImpl.java | 8 +++ .../thread/CompanyProductsRelService.java | 2 +- .../mybatis/mapper/basic/EntrustReceDao.xml | 4 +- .../mybatis/mapper/basic/UdiInfoDao.xml | 51 +++++++++++++++++++ 8 files changed, 103 insertions(+), 6 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderDetailController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderDetailController.java index 1adc0d6..f90ec60 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderDetailController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderDetailController.java @@ -5,12 +5,15 @@ import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; import com.glxp.sale.admin.annotation.AuthRuleAnnotation; import com.glxp.sale.admin.constant.ConstantStatus; +import com.glxp.sale.admin.dao.info.BasicProductSetDao; +import com.glxp.sale.admin.dao.inventory.InvProductDao; import com.glxp.sale.admin.entity.auth.AuthAdmin; import com.glxp.sale.admin.entity.basic.BussinessLocalTypeEntity; import com.glxp.sale.admin.entity.basic.UdiInfoEntity; import com.glxp.sale.admin.entity.inout.StockOrderDetailEntity; import com.glxp.sale.admin.entity.inout.StockOrderEntity; import com.glxp.sale.admin.entity.inout.WarehouseEntity; +import com.glxp.sale.admin.entity.inventory.InvProductEntity; import com.glxp.sale.admin.entity.param.SystemParamConfigEntity; import com.glxp.sale.admin.entity.udid.UdiEntity; import com.glxp.sale.admin.exception.JsonException; @@ -36,6 +39,7 @@ import com.glxp.sale.admin.service.inout.CodesService; import com.glxp.sale.admin.service.inout.StockOrderDetailService; import com.glxp.sale.admin.service.inout.StockOrderDetailTempService; import com.glxp.sale.admin.service.inout.StockOrderService; +import com.glxp.sale.admin.service.inventory.InvProductService; import com.glxp.sale.admin.service.param.SystemParamConfigService; import com.glxp.sale.admin.service.purchase.SupProductService; import com.glxp.sale.admin.util.Constant; @@ -83,6 +87,9 @@ public class StockOrderDetailController { CodesService codesService; @Resource SupProductService supProductService; + @Resource + InvProductService invProductService; + @AuthRuleAnnotation("") @GetMapping("/udiwms/stock/order/detail/filter") @@ -587,6 +594,30 @@ public class StockOrderDetailController { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } + //判断 + InvProductEntity invProductEntity=invProductService.selectExit(stockOrderDetailFilterRequest.getProductId()); + if(invProductEntity!=null){ + UdiInfoEntity udiInfoEntity= udiInfoService.findByNameCode(invProductEntity.getNameCode()); + if(udiInfoEntity!=null){ + if(udiInfoEntity.getScbssfbhph().equals("是")){ + if(stockOrderDetailFilterRequest.getBatchNo()==null){ + return ResultVOUtils.error(999,"批次号不能为空！"); + } + } + if(udiInfoEntity.getScbssfbhscrq().equals("是")){ + if(stockOrderDetailFilterRequest.getProductDate()==null){ + return ResultVOUtils.error(999,"生产日期不能为空！"); + } + } + if(udiInfoEntity.getScbssfbhsxrq().equals("是")){ + if(stockOrderDetailFilterRequest.getExpireDate()==null){ + return ResultVOUtils.error(999,"失效日期不能为空！"); + } + } + } + } + + if (StringUtils.isNotBlank(stockOrderDetailFilterRequest.getId())) { if (StringUtils.isBlank(stockOrderDetailFilterRequest.getCount()) || StringUtils.isBlank(stockOrderDetailFilterRequest.getReCount())) { @@ -660,7 +691,7 @@ public class StockOrderDetailController { /** * 更新单据详情信息 * - * @param stockOrderDetailEntities + * @param * @return */ @AuthRuleAnnotation("") 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 b8a5da0..ee58065 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 @@ -607,6 +607,7 @@ public class WareHouseController { addOrderRequest.setAction(addOrderRequest.getBillType()); } BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(addOrderRequest.getAction()); + String code = addOrderRequest.getCode(); if (StringUtils.isBlank(code)) return ResultVOUtils.error(ResultEnum.DATA_ERROR); UdiEntity udiEntity = FilterUdiUtils.getUdi(code); @@ -839,7 +840,7 @@ public class WareHouseController { if (udiRelevanceResponse.getBhzxxsbzsl() == 0) { actCount = udiRelevanceResponse.getZxxsbzbhsydysl(); } else { - actCount = udiRelevanceResponse.getBhzxxsbzsl() * udiRelevanceResponse.getBhzxxsbzsl(); + actCount = udiRelevanceResponse.getBhzxxsbzsl() * udiRelevanceResponse.getZxxsbzbhsydysl(); } } else { actCount = udiRelevanceResponse.getBhzxxsbzsl(); @@ -907,7 +908,9 @@ public class WareHouseController { return baseResponse; } checkSupId(bussinessTypeEntity, warehouseEntity); - return baseResponse; + + + } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/basic/UdiInfoDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/basic/UdiInfoDao.java index 8708edd..4a1115d 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/dao/basic/UdiInfoDao.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/basic/UdiInfoDao.java @@ -51,4 +51,6 @@ public interface UdiInfoDao { */ void importUdiInfo(@Param("udiInfoEntities") List udiInfoEntities); + boolean updateUdiInfoNotAll(UdiInfoRequest udiInfoRequest); + } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/UdiInfoService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/UdiInfoService.java index 774cfca..2767fec 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/UdiInfoService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/UdiInfoService.java @@ -38,4 +38,6 @@ public interface UdiInfoService { boolean deleteByUuid(String uuid); + boolean updateUdiInfoNotAll(UdiInfoRequest udiInfoRequest); + } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/UdiInfoServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/UdiInfoServiceImpl.java index 68e0e21..b185e79 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/UdiInfoServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/UdiInfoServiceImpl.java @@ -117,4 +117,12 @@ public class UdiInfoServiceImpl implements UdiInfoService { public boolean deleteByUuid(String uuid) { return udiInfoDao.deleteByUuid(uuid); } + + + @Override + public boolean updateUdiInfoNotAll(UdiInfoRequest udiInfoRequest) { + if (StrUtil.isEmpty(udiInfoRequest.getUuid())) + return false; + return udiInfoDao.updateUdiInfoNotAll(udiInfoRequest); + } } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/CompanyProductsRelService.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/CompanyProductsRelService.java index aa7d3f8..ddd06d8 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/thread/CompanyProductsRelService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/thread/CompanyProductsRelService.java @@ -48,7 +48,7 @@ public class CompanyProductsRelService { UdiRelevanceRequest udiRelevanceRequest=new UdiRelevanceRequest(); org.springframework.beans.BeanUtils.copyProperties(udiRelevanceEntity,udiRelevanceRequest); udiRelevanceService.updateUdiRelevance(udiRelevanceRequest); - udiInfoService.updateUdiInfo(udiInfoRequest); + udiInfoService.updateUdiInfoNotAll(udiInfoRequest); companyProductRelevanceEntity.setCreate_time(new Date()); companyProductRelevanceEntity.setUpdate_time(new Date()); companyProductRelevanceEntity.setAuditStatus("3"); diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/EntrustReceDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/EntrustReceDao.xml index 67961f3..e93a04a 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/EntrustReceDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/EntrustReceDao.xml @@ -82,8 +82,8 @@