diff --git a/src/main/java/com/glxp/api/constant/Constant.java b/src/main/java/com/glxp/api/constant/Constant.java index ef466a05..dbf8400d 100644 --- a/src/main/java/com/glxp/api/constant/Constant.java +++ b/src/main/java/com/glxp/api/constant/Constant.java @@ -228,5 +228,6 @@ public class Constant { public static final String ORDER_ACTION_NOR_DETAIL = "norDetail"; public static final String ORDER_ACTION_PRE_DETAIL = "preDetail"; + public static final String ORDER_ACTION_SUP_DELIVERY = "supDelivery"; } diff --git a/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java b/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java index c739bd49..824fd10c 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java @@ -181,23 +181,35 @@ public class BasicBussinessTypeController extends BaseController { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } - //判断是否是医院用户 - if (isHosUser()) { - bussinessTypeFilterRequest.setUserId(getUserId()); + + if (StrUtil.isNotEmpty(bussinessTypeFilterRequest.getVueType())) { + List bussinessTypeEntities = basicBussinessTypeService.findByVueType(bussinessTypeFilterRequest.getVueType()); + PageInfo pageInfo; + pageInfo = new PageInfo<>(bussinessTypeEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(bussinessTypeEntities); + return ResultVOUtils.success(pageSimpleResponse); } else { - //当前用户为供应商，查询单据类型添加允许供应商使用参数 - bussinessTypeFilterRequest.setSpUse(true); + //判断是否是医院用户 + if (isHosUser()) { + bussinessTypeFilterRequest.setUserId(getUserId()); + } else { + //当前用户为供应商，查询单据类型添加允许供应商使用参数 + bussinessTypeFilterRequest.setSpUse(true); + } + List bussinessTypeEntities; + bussinessTypeEntities = basicBussinessTypeService.filterJoinByUser( + bussinessTypeFilterRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(bussinessTypeEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(bussinessTypeEntities); + return ResultVOUtils.success(pageSimpleResponse); } - List bussinessTypeEntities; - bussinessTypeEntities = basicBussinessTypeService.filterJoinByUser( - bussinessTypeFilterRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(bussinessTypeEntities); - PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); - pageSimpleResponse.setTotal(pageInfo.getTotal()); - pageSimpleResponse.setList(bussinessTypeEntities); - return ResultVOUtils.success(pageSimpleResponse); + } diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java index d7ca9598..9f8f8dde 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java @@ -73,11 +73,9 @@ public class IoOrderController extends BaseController { if (StrUtil.isNotBlank(filterOrderRequest.getStatusType())) { orderService.setFilterStatus(filterOrderRequest); } - if (StrUtil.isNotBlank(filterOrderRequest.getActionType())) { + if (StrUtil.isNotBlank(filterOrderRequest.getVueType())) { orderService.setActions(filterOrderRequest); } - - String customerId = getCustomerId(); if (!customerId.equals("110")) { filterOrderRequest.setFromCorp(customerId); diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java index 5c5ffcdf..958c5169 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java @@ -70,7 +70,7 @@ public class IoOrderDetailResultController extends BaseController { orderDetailResultRequest.setFromCorp(getCustomerId()); } FilterOrderRequest filterOrderRequest = new FilterOrderRequest(); - filterOrderRequest.setActionType(orderDetailResultRequest.getActionType()); + filterOrderRequest.setVueType(orderDetailResultRequest.getActionType()); List actions = orderService.setActions(filterOrderRequest); if (CollUtil.isEmpty(actions)) { return ResultVOUtils.success(""); diff --git a/src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java index 2d1404c7..bbe36eb4 100644 --- a/src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java @@ -387,5 +387,14 @@ public class BasicBussinessTypeEntity { @TableField(value = "thrCheckCopy") private boolean thrCheckCopy; + @TableField(value = "fillCodeRel") + private boolean fillCodeRel; + @TableField(value = "checkVailDate") + private boolean checkVailDate; + @TableField(value = "checkExpire") + private boolean checkExpire; + @TableField(value = "checkCertExpire") + private boolean checkCertExpire; + } diff --git a/src/main/java/com/glxp/api/req/basic/BussinessTypeSaveRequest.java b/src/main/java/com/glxp/api/req/basic/BussinessTypeSaveRequest.java index 7424d603..ac0603cb 100644 --- a/src/main/java/com/glxp/api/req/basic/BussinessTypeSaveRequest.java +++ b/src/main/java/com/glxp/api/req/basic/BussinessTypeSaveRequest.java @@ -1,5 +1,6 @@ package com.glxp.api.req.basic; +import com.baomidou.mybatisplus.annotation.TableField; import lombok.Data; import javax.validation.constraints.NotBlank; @@ -275,7 +276,7 @@ public class BussinessTypeSaveRequest { private boolean vailDispatch; //校验是否可配送 private int vailGroupBuy; //校验是否集采产品 0:全部，1：只采集集采产品，2：只采集非集采产品 private Integer busType; //1:正常；2：送货；3.到货 - private int actionType; + private int actionType; //1：带票（正常）；2.预验收。3：寄售 private boolean inStock; @@ -290,4 +291,13 @@ public class BussinessTypeSaveRequest { private boolean thrCheckBalance; private boolean thrCheckCopy; + private boolean fillCodeRel; + + + + private boolean checkVailDate; + private boolean checkExpire; + private boolean checkCertExpire; + + } diff --git a/src/main/java/com/glxp/api/req/basic/FilterBussinessTypeRequest.java b/src/main/java/com/glxp/api/req/basic/FilterBussinessTypeRequest.java index 4c23bf4b..2a166985 100644 --- a/src/main/java/com/glxp/api/req/basic/FilterBussinessTypeRequest.java +++ b/src/main/java/com/glxp/api/req/basic/FilterBussinessTypeRequest.java @@ -105,5 +105,7 @@ public class FilterBussinessTypeRequest extends ListPageRequest { private Integer busType; private Boolean inStock; + private Boolean fillCodeRel; + private String vueType; } diff --git a/src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java b/src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java index d6fbc06a..df32acbc 100644 --- a/src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java +++ b/src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java @@ -148,7 +148,7 @@ public class FilterOrderRequest extends ListPageRequest { * 出入库明细账 norDetail * 寄售出入库明细账 preDetail */ - private String actionType; + private String vueType; //页面类型 private Integer orderType; diff --git a/src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java b/src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java index 033ef764..7076379b 100644 --- a/src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java +++ b/src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java @@ -128,7 +128,7 @@ public class BasicBussinessTypeResponse { private int vailGroupBuy; //校验是否集采产品 0:全部，1：只采集集采产品，2：只采集非集采产品 private Integer busType; //1:正常；2：送货；3.到货 - private int actionType; + private int actionType; //1：带票（正常）；2.预验收。3：寄售 private boolean inStock; private boolean thrCheckEnable; @@ -142,4 +142,10 @@ public class BasicBussinessTypeResponse { private boolean thrCheckBalance; private boolean thrCheckCopy; + private boolean fillCodeRel; + + private boolean checkVailDate; + private boolean checkExpire; + private boolean checkCertExpire; + } diff --git a/src/main/java/com/glxp/api/service/basic/IBasicBussinessTypeService.java b/src/main/java/com/glxp/api/service/basic/IBasicBussinessTypeService.java index ff9f3e0e..3c1c0284 100644 --- a/src/main/java/com/glxp/api/service/basic/IBasicBussinessTypeService.java +++ b/src/main/java/com/glxp/api/service/basic/IBasicBussinessTypeService.java @@ -67,7 +67,7 @@ public interface IBasicBussinessTypeService { * * @param bussinessTypeEntity */ - boolean insertIgnoreBussinessType(BasicBussinessTypeEntity bussinessTypeEntity,String id); + boolean insertIgnoreBussinessType(BasicBussinessTypeEntity bussinessTypeEntity, String id); /** * 查询单据类型实体列表，不分页 @@ -110,4 +110,7 @@ public interface IBasicBussinessTypeService { boolean checkBusTypeNameExists(String name, Integer id); List selectIgnoreSelf(String action); + + + List findByVueType(String vueType); } diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java index 7577ec25..25aacefb 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java @@ -4,6 +4,8 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; +import com.glxp.api.constant.Constant; +import com.glxp.api.constant.ConstantStatus; import com.glxp.api.constant.ConstantType; import com.glxp.api.dao.basic.BasicBussinessTypeDao; import com.glxp.api.entity.basic.BasicBussinessTypeEntity; @@ -19,6 +21,7 @@ import javax.annotation.Resource; import java.util.Collections; import java.util.Date; import java.util.List; +import java.util.stream.Collectors; @Slf4j @Service @@ -126,8 +129,8 @@ public class BasicBussinessTypeServiceImpl implements IBasicBussinessTypeService } @Override - public boolean insertIgnoreBussinessType(BasicBussinessTypeEntity bussinessTypeEntity,String id) { - setUpdateInfoById(bussinessTypeEntity,id); + public boolean insertIgnoreBussinessType(BasicBussinessTypeEntity bussinessTypeEntity, String id) { + setUpdateInfoById(bussinessTypeEntity, id); return basicBussinessTypeDao.insertIgnoreBussinessType(bussinessTypeEntity); } @@ -188,6 +191,35 @@ public class BasicBussinessTypeServiceImpl implements IBasicBussinessTypeService return list; } + @Override + public List findByVueType(String vueType) { + + List bussinessTypeEntities = null; + + switch (vueType) { + case Constant.ORDER_ACTION_NOR_DETAIL: + bussinessTypeEntities = basicBussinessTypeDao.selectList(new QueryWrapper() + .eq("actionType", 1).eq("inStock", true)); + break; + + case Constant.ORDER_ACTION_PRE_DETAIL: + bussinessTypeEntities = basicBussinessTypeDao.selectList(new QueryWrapper() + .eq("actionType", 3).eq("inStock", true)); + break; + case Constant.ORDER_ACTION_SUP_DELIVERY: + bussinessTypeEntities = basicBussinessTypeDao.selectList(new QueryWrapper() + .eq("mainAction", ConstantType.TYPE_PUT).eq("corpType", ConstantStatus.CORP_TYPE_OUT) + .eq("spUse", true)); + + break; + + default: + break; + } + + return bussinessTypeEntities; + } + /** * 统一设置创建/更新信息 * @@ -205,7 +237,7 @@ public class BasicBussinessTypeServiceImpl implements IBasicBussinessTypeService } - private void setUpdateInfoById(BasicBussinessTypeEntity bussinessTypeEntity,String id) { + private void setUpdateInfoById(BasicBussinessTypeEntity bussinessTypeEntity, String id) { Date now = new Date(); diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java index 76b530e1..649fd141 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java @@ -542,28 +542,11 @@ public class IoOrderServiceImpl implements IoOrderService { public List setActions(FilterOrderRequest filterOrderRequest) { List bussinessTypeEntities; List actions = null; - if (filterOrderRequest.getActionType() == null) + if (filterOrderRequest.getVueType() == null) return null; - switch (filterOrderRequest.getActionType()) { - - case Constant.ORDER_ACTION_NOR_DETAIL: - bussinessTypeEntities = basicBussinessTypeDao.selectList(new QueryWrapper() - .eq("actionType", 1).eq("inStock", true)); - actions = bussinessTypeEntities.stream().map(BasicBussinessTypeEntity::getAction).collect(Collectors.toList()); - filterOrderRequest.setActions(actions); - break; - - case Constant.ORDER_ACTION_PRE_DETAIL: - bussinessTypeEntities = basicBussinessTypeDao.selectList(new QueryWrapper() - .eq("actionType", 3).eq("inStock", true)); - actions = bussinessTypeEntities.stream().map(BasicBussinessTypeEntity::getAction).collect(Collectors.toList()); - filterOrderRequest.setActions(actions); - break; - - default: - break; - } - ; + bussinessTypeEntities = basicBussinessTypeService.findByVueType(filterOrderRequest.getVueType()); + actions = bussinessTypeEntities.stream().map(BasicBussinessTypeEntity::getAction).collect(Collectors.toList()); + filterOrderRequest.setActions(actions); return actions; } diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvInnerOrderPrintServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvInnerOrderPrintServiceImpl.java index fcf7544a..9161b8ef 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvInnerOrderPrintServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvInnerOrderPrintServiceImpl.java @@ -120,7 +120,7 @@ public class InvInnerOrderPrintServiceImpl implements InvInnerOrderPrintService String udiCode = "#" + udiProductEntity.getNameCode() + "#" + obj.getProductDate() + "#" + obj.getExpireDate() + "#" + obj.getBatchNo() + "#" + udiProductEntity.getSerialNo() + "#" + udiProductEntity.getWarehouseCode() + "#" + udiProductEntity.getDeptCode(); - udiCode = udiCode.replaceAll("#null", ""); + udiCode = udiCode.replaceAll("#null", "#"); innerOrderPrintEntity.setUdiCode(udiCode); invInnerOrderPrintDao.insert(innerOrderPrintEntity); } diff --git a/src/main/java/com/glxp/api/util/udi/UdiCalCountUtil.java b/src/main/java/com/glxp/api/util/udi/UdiCalCountUtil.java index 78119a3f..dc9c7b81 100644 --- a/src/main/java/com/glxp/api/util/udi/UdiCalCountUtil.java +++ b/src/main/java/com/glxp/api/util/udi/UdiCalCountUtil.java @@ -28,7 +28,7 @@ public class UdiCalCountUtil { if (udiRelevanceResponse.getBhzxxsbzsl() == 0) { udiRelevanceResponse.setBhzxxsbzsl(1); } - if (udiRelevanceResponse.getZxxsbzbhsydysl() == 0) { + if (udiRelevanceResponse.getZxxsbzbhsydysl() == null || udiRelevanceResponse.getZxxsbzbhsydysl() == 0) { udiRelevanceResponse.setZxxsbzbhsydysl(1); } actCount = udiRelevanceResponse.getBhzxxsbzsl() * udiRelevanceResponse.getZxxsbzbhsydysl(); diff --git a/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml b/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml index 91138ecb..d67e15f9 100644 --- a/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml +++ b/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml @@ -16,9 +16,6 @@ AND bu.inStock = #{inStock} - - AND bu.advanceType = #{advanceType} - AND bu.enable = #{enable} @@ -70,11 +67,11 @@ checkBalance, secCheckBalance, useDyCount, expireTip, updateTime, defaultUnit, prefix, outToSpms, ullageFill, scanPreIn, vailInv, entrutSpms, codeFillCheck, defaultSubInv, defaultInv, orderVisibleType, - checkCopy, secCheckCopy, originAction, advanceType, changeEnable, + checkCopy, secCheckCopy, originAction, changeEnable, spUse, preIn, supplementAll, createUser, createTime, preInBack, vailDispatch, vailGroupBuy, busType, inStock, actionType , thrCheckEnable, thrCheckWebNew, thrCheckPdaUn, thrCheckPdaEd, thrCheckUdims, thrCheckPc, thrCheckSp - , thrCheckChange, thrCheckBalance, thrCheckCopy) + , thrCheckChange, thrCheckBalance, thrCheckCopy, fillCodeRel,checkVailDate,checkCertExpire) values (#{mainAction}, #{action}, #{name}, @@ -120,7 +117,6 @@ #{checkCopy}, #{secCheckCopy}, #{originAction}, - #{advanceType}, #{changeEnable}, #{spUse}, #{preIn}, @@ -129,7 +125,9 @@ #{createTime}, #{preInBack}, #{vailDispatch}, #{vailGroupBuy}, #{busType}, #{inStock}, #{actionType} , #{thrCheckEnable}, #{thrCheckWebNew}, #{thrCheckPdaUn}, #{thrCheckPdaEd}, #{thrCheckUdims}, #{thrCheckPc} - , #{thrCheckSp}, #{thrCheckChange}, #{thrCheckBalance}, #{thrCheckCopy}) + , #{thrCheckSp}, #{thrCheckChange}, #{thrCheckBalance}, #{thrCheckCopy}, #{fillCodeRel} + , #{checkVailDate}, #{checkExpire}, #{checkCertExpire} + )