From f7442615dd4a1f077caffc4562e6db1123596c23 Mon Sep 17 00:00:00 2001 From: anthonyywj2 <353682448@qq.com> Date: Sun, 6 Mar 2022 10:35:18 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=A4=87=E4=BB=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/BussinessLocalTypeController.java | 26 +- .../business/StockOrderDetailController.java | 35 ++- .../dao/basic/BussinessLocalTypeDao.java | 2 + .../dao/basic/CompanyProductRelevanceDao.java | 37 +++ .../basic/BussinessLocalTypeEntity.java | 2 + .../entity/basic/BussinessTypeEntity.java | 4 +- .../basic/CompanyProductRelevanceEntity.java | 24 ++ .../BussinessLocalTypeFilterRequest.java | 2 + .../basic/CompanyProductRelevanceRequest.java | 48 +++ .../FilterCompanyProductRelevanceRequest.java | 14 + .../req/business/StockOrderIdsRequest.java | 2 + .../admin/res/basic/BussinessTypResponse.java | 4 + .../info/CompanyProductRelevanceResponse.java | 61 ++++ .../basic/BussinessLocalTypeService.java | 2 + .../impl/BussinessLocalTypeServiceImpl.java | 5 + .../info/CompanyProductRelevanceService.java | 36 +++ .../CompanyProductRelevanceServiceImpl.java | 110 +++++++ .../mapper/basic/BussinessLocalTypeDao.xml | 44 ++- .../mybatis/mapper/basic/BussinessTypeDao.xml | 13 +- .../basic/CompanyProductRelevanceDao.xml | 275 ++++++++++++++++++ .../mybatis/mapper/inout/OrderDao.xml | 7 +- 21 files changed, 722 insertions(+), 31 deletions(-) create mode 100644 api-admin/src/main/java/com/glxp/api/admin/dao/basic/CompanyProductRelevanceDao.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/entity/basic/CompanyProductRelevanceEntity.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/req/basic/CompanyProductRelevanceRequest.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterCompanyProductRelevanceRequest.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/res/info/CompanyProductRelevanceResponse.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/service/info/CompanyProductRelevanceService.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/service/info/impl/CompanyProductRelevanceServiceImpl.java create mode 100644 api-admin/src/main/resources/mybatis/mapper/basic/CompanyProductRelevanceDao.xml diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BussinessLocalTypeController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BussinessLocalTypeController.java index 93856eae..180277bb 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BussinessLocalTypeController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BussinessLocalTypeController.java @@ -65,8 +65,14 @@ public class BussinessLocalTypeController { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } - List bussinessTypeEntities; + List bussinessTypeEntities = null; +// if (bussinessTypeFilterRequest.getIsFilterBind()) { +// bussinessTypeEntities = bussinessLocalTypeService.filterUnBind(bussinessTypeFilterRequest); +// } else { bussinessTypeEntities = bussinessLocalTypeService.filterList(bussinessTypeFilterRequest); +// } + + PageInfo pageInfo; pageInfo = new PageInfo<>(bussinessTypeEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); @@ -84,18 +90,24 @@ public class BussinessLocalTypeController { } String id = deleteRequest.getId(); BussinessLocalTypeEntity bussinessLocalTypeEntity = bussinessLocalTypeService.selectById(id); - StockOrderFilterRequest stockOrderFilterRequest = new StockOrderFilterRequest(); - stockOrderFilterRequest.setBillType(bussinessLocalTypeEntity.getAction()); - StockOrderEntity stockOrderEntity = stockOrderService.findOne(stockOrderFilterRequest); - if (stockOrderEntity != null) { - return ResultVOUtils.error(500, "已存在该类型码业务单据，无法删除！"); + BussinessLocalTypeFilterRequest bussinessTypeFilterRequest = new BussinessLocalTypeFilterRequest(); + bussinessTypeFilterRequest.setAction(bussinessLocalTypeEntity.getAction()); + List bussinessLocalTypeEntities = bussinessLocalTypeService.filterJoin(bussinessTypeFilterRequest); + if (bussinessLocalTypeEntities != null && bussinessLocalTypeEntities.size() > 0) { + return ResultVOUtils.error(500, "该业务单据类型已被扫码单据类型绑定，无法删除！"); + } else { + StockOrderFilterRequest stockOrderFilterRequest = new StockOrderFilterRequest(); + stockOrderFilterRequest.setBillType(bussinessLocalTypeEntity.getAction()); + StockOrderEntity stockOrderEntity = stockOrderService.findOne(stockOrderFilterRequest); + if (stockOrderEntity != null) { + return ResultVOUtils.error(500, "已存在该类型业务单据，无法删除！"); + } } BussinessChangeTypeEntity bussinessChangeTypeEntity = bussinessChangeTypeService.findFirstByAction(bussinessLocalTypeEntity.getAction()); if (bussinessChangeTypeEntity != null && bussinessChangeTypeEntity.getScAction() != null) { return ResultVOUtils.error(500, "该业务单据类型已绑定流转单据类型，无法删除！"); } - bussinessLocalTypeService.deleteById(id); return ResultVOUtils.success("删除成功"); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderDetailController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderDetailController.java index b97ac57b..65b3a122 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderDetailController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderDetailController.java @@ -215,6 +215,7 @@ public class StockOrderDetailController { public BaseResponse getStockOrderDetailInstrumentById(@RequestBody StockOrderIdsRequest stockOrderIdsRequest) { List stockOrderDetailEntityList = new ArrayList<>(); + List originDatas = stockOrderIdsRequest.getStockOrderLists(); for (String id : stockOrderIdsRequest.getIds()) { FilterUdiInfoRequest companyProductRelevanceRequest = new FilterUdiInfoRequest(); companyProductRelevanceRequest.setId(id); @@ -227,25 +228,47 @@ public class StockOrderDetailController { stockOrderDetailEntity.setProductId(udiInfoEntity.getId() + ""); stockOrderDetailEntity.setProductName(udiInfoEntity.getCpmctymc()); stockOrderDetailEntity.setSpec(udiInfoEntity.getGgxh()); + stockOrderDetailEntity.setCount(0 + ""); + stockOrderDetailEntity.setReCount(0 + ""); + stockOrderDetailEntity.setYlqxzcrbarmc(udiInfoEntity.getYlqxzcrbarmc()); + stockOrderDetailEntity.setZczbhhzbapzbh(udiInfoEntity.getZczbhhzbapzbh()); if (stockOrderIdsRequest.getUdiEntity() != null) { UdiEntity udiEntity = stockOrderIdsRequest.getUdiEntity(); stockOrderDetailEntity.setBatchNo(udiEntity.getBatchNo()); stockOrderDetailEntity.setProductDate(udiEntity.getProduceDate()); stockOrderDetailEntity.setExpireDate(udiEntity.getExpireDate()); - } - stockOrderDetailEntity.setCount(0 + ""); - stockOrderDetailEntity.setReCount(0 + ""); - stockOrderDetailEntity.setYlqxzcrbarmc(udiInfoEntity.getYlqxzcrbarmc()); - stockOrderDetailEntity.setZczbhhzbapzbh(udiInfoEntity.getZczbhhzbapzbh()); - stockOrderDetailEntityList.add(stockOrderDetailEntity); + + if (originDatas != null && originDatas.size() > 0) { + if (!isSameBatch(originDatas, stockOrderDetailEntity)) { + stockOrderDetailEntityList.add(stockOrderDetailEntity); + } + } else { + stockOrderDetailEntityList.add(stockOrderDetailEntity); + } + } else + stockOrderDetailEntityList.add(stockOrderDetailEntity); } } + if (originDatas != null && originDatas.size() > 0) { + stockOrderDetailEntityList.addAll(originDatas); + } if (stockOrderDetailEntityList.size() == 0) { return ResultVOUtils.error(ResultEnum.DATA_NOT, "未找到产品"); } return ResultVOUtils.success(stockOrderDetailEntityList); } + public boolean isSameBatch(List originDatas, StockOrderDetailEntity stockOrderDetailEntity) { + for (StockOrderDetailEntity temp : originDatas) { + if ((temp.getBatchNo() != null && temp.getBatchNo().equals(stockOrderDetailEntity.getBatchNo())) + && (temp.getProductId().equals(stockOrderDetailEntity.getProductId()))) { + temp.setCount(Integer.parseInt(temp.getCount()) + Integer.parseInt(stockOrderDetailEntity.getCount()) + ""); + return true; + } + } + return false; + } + @GetMapping("/udiwms/stock/order/detail/addFromCode") public BaseResponse addStockOrderDetailFromCode(@RequestParam("orderId") String orderId, @RequestParam("count") String count, diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BussinessLocalTypeDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BussinessLocalTypeDao.java index a94be8bf..f214d104 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BussinessLocalTypeDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BussinessLocalTypeDao.java @@ -14,6 +14,8 @@ public interface BussinessLocalTypeDao { List filterList(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest); + List filterUnBind(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest); + List filterJoin(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest); BussinessLocalTypeEntity findBTByAction(String action); diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/CompanyProductRelevanceDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/CompanyProductRelevanceDao.java new file mode 100644 index 00000000..6b95e17a --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/CompanyProductRelevanceDao.java @@ -0,0 +1,37 @@ +package com.glxp.api.admin.dao.basic; + +import com.glxp.api.admin.entity.basic.CompanyProductRelevanceEntity; +import com.glxp.api.admin.req.basic.CompanyProductRelevanceRequest; +import com.glxp.api.admin.req.basic.FilterCompanyProductRelevanceRequest; +import com.glxp.api.admin.res.info.CompanyProductRelevanceResponse; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface CompanyProductRelevanceDao { + + List filterUdiGp(CompanyProductRelevanceRequest basicInstrumentMaintainRequest); + + List filterCompanyProductRelevance(FilterCompanyProductRelevanceRequest filterCompanyProductRelevanceRequest); + + CompanyProductRelevanceEntity findCompanyProductRelevance(Long CustomerId); + + + CompanyProductRelevanceEntity findCompanyProductRelevanceByProductId(String productId); + + CompanyProductRelevanceEntity findCompanyProductRelevanceByUdiRlIdFk(@Param("udiRlIdFk") String udiRlIdFk, @Param("customerId") String customerId); + + CompanyProductRelevanceEntity findCompanyProductRelevanceByProductUuid(CompanyProductRelevanceEntity companyProductRelevanceEntity); + + List getCompanyProductRelevance(FilterCompanyProductRelevanceRequest filterCompanyProductRelevanceRequest); + + boolean updateCompanyProductRelevance(CompanyProductRelevanceEntity companyCertEntity); + + boolean insertCompanyProductRelevance(CompanyProductRelevanceEntity companyCertEntity); + + boolean deleteById(String id); + + boolean deleteByRlId(String id); +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BussinessLocalTypeEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BussinessLocalTypeEntity.java index 61934499..b0bb1aa8 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BussinessLocalTypeEntity.java +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BussinessLocalTypeEntity.java @@ -17,4 +17,6 @@ public class BussinessLocalTypeEntity { private Boolean changeEnable; private int corpType; private boolean genUnit; + private String storageCode; + private Boolean spUse; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BussinessTypeEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BussinessTypeEntity.java index 82d3c091..1805042a 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BussinessTypeEntity.java +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BussinessTypeEntity.java @@ -18,8 +18,6 @@ public class BussinessTypeEntity { private boolean innerOrder; private boolean secCheckEnable; private String thirdSys; - - private boolean checkUdims; private boolean checkPdaEd; private boolean checkPdaUn; @@ -37,6 +35,6 @@ public class BussinessTypeEntity { private boolean secCheckSp; private Integer index; - private int corpType; + private String storageCode; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/CompanyProductRelevanceEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/CompanyProductRelevanceEntity.java new file mode 100644 index 00000000..c9d143e9 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/CompanyProductRelevanceEntity.java @@ -0,0 +1,24 @@ +package com.glxp.api.admin.entity.basic; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.util.Date; + +@Data +public class CompanyProductRelevanceEntity { + + private Integer id; + private Long customerId; + private Long productId; + private Long enterpriseId; + private Long registrationId; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date create_time; + private Date update_time; + private String auditStatus; + private String productUuid; + private Integer udiRlIdFk; + private String unitFk; + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/basic/BussinessLocalTypeFilterRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/basic/BussinessLocalTypeFilterRequest.java index beeb3a6a..7a771972 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/basic/BussinessLocalTypeFilterRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/basic/BussinessLocalTypeFilterRequest.java @@ -11,4 +11,6 @@ public class BussinessLocalTypeFilterRequest extends ListPageRequest { private Boolean enabled; private String originAction; private Boolean changeEnable; + private Boolean isFilterBind; + private Boolean spUse; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/basic/CompanyProductRelevanceRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/basic/CompanyProductRelevanceRequest.java new file mode 100644 index 00000000..2ca15aab --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/basic/CompanyProductRelevanceRequest.java @@ -0,0 +1,48 @@ +package com.glxp.api.admin.req.basic; + +import com.glxp.api.admin.req.ListPageRequest; +import lombok.Data; + +@Data +public class CompanyProductRelevanceRequest extends ListPageRequest { + private String ylqxzcrbarmc; + private String cpmctymc; + private String nameCode; + private String uuid; + private String ggxh; + private String thirdId; + private String id; + + private String thirdId1; + private String thirdId2; + private String thirdId3; + private String thirdId4; + + + private String thirdCode; + private String thirdSys; + + private String lastUpdateTime; + private String zczbhhzbapzbh; + private Integer diType; + + + private String unionCode; + private String udiCode; + private String thrPiId; + + + private Boolean isCheck; + + private Integer filterType; //0:全部，1.对照完成，2.未对照DI，3.未对照产品编码，4.未对照其他产品编码 + + + private String customerId; + + + private String auditStatus; + private String companyName; + private Integer lockStatus; + private Boolean isAdavence; + private String unitFk; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterCompanyProductRelevanceRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterCompanyProductRelevanceRequest.java new file mode 100644 index 00000000..8fe79025 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterCompanyProductRelevanceRequest.java @@ -0,0 +1,14 @@ +package com.glxp.api.admin.req.basic; + +import com.glxp.api.admin.req.ListPageRequest; +import lombok.Data; + +@Data +public class FilterCompanyProductRelevanceRequest extends ListPageRequest { + + private Long customerId; + private Long productId; + private String productUuid; + private String udiRlIdFk; + private String unitFk; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/business/StockOrderIdsRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/business/StockOrderIdsRequest.java index 89d4c647..1f3534cf 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/business/StockOrderIdsRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/business/StockOrderIdsRequest.java @@ -1,6 +1,7 @@ package com.glxp.api.admin.req.business; import com.glxp.api.admin.entity.basic.UdiEntity; +import com.glxp.api.admin.entity.business.StockOrderDetailEntity; import lombok.Data; import java.util.List; @@ -12,4 +13,5 @@ public class StockOrderIdsRequest { List ids; boolean filterUDIType; UdiEntity udiEntity; + List stockOrderLists; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/basic/BussinessTypResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/basic/BussinessTypResponse.java index e1d0afe2..85c6f93b 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/basic/BussinessTypResponse.java +++ b/api-admin/src/main/java/com/glxp/api/admin/res/basic/BussinessTypResponse.java @@ -39,4 +39,8 @@ public class BussinessTypResponse { private boolean secCheckSp; + private int corpType; + private String storageCode; + + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/info/CompanyProductRelevanceResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/info/CompanyProductRelevanceResponse.java new file mode 100644 index 00000000..d7616419 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/res/info/CompanyProductRelevanceResponse.java @@ -0,0 +1,61 @@ +package com.glxp.api.admin.res.info; + +import lombok.Data; + +@Data +public class CompanyProductRelevanceResponse { + + private int id; + private Integer rlId; + private String thirdId; + private String thirdName; + private String uuid; + private String nameCode; + private String packLevel; + private String packRatio; + private Integer bhxjsl; + private Integer bhzxxsbzsl; + private Integer zxxsbzbhsydysl; + private String bhxjcpbm; + private String sjcpbm; // + private String bzcj; + private String deviceRecordKey; + private int isUseDy; + private String cpmctymc; + private String cplb; + private String flbm; + private String ggxh; + private String qxlb; + private String tyshxydm; + private String ylqxzcrbarmc; + private String zczbhhzbapzbh; + private String ylqxzcrbarywmc; + private String sydycpbs; + private int versionNumber; + private int diType; + + private String thirdId1; + private String thirdId2; + private String thirdId3; + private String thirdId4; + private String thirdName1; + private String thirdName2; + private String thirdName3; + private String thirdName4; + + private String ybbm; + private String sptm; + private String manufactory; + private String measname; + + private long customerId; + + private String auditStatus; + private Boolean isLock; + private Integer lockStatus; + private String companyName; + private String mainId; + private String mainName; + private Boolean isAdavence; + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/BussinessLocalTypeService.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/BussinessLocalTypeService.java index 60105f59..88138bb5 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/BussinessLocalTypeService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/basic/BussinessLocalTypeService.java @@ -11,6 +11,8 @@ public interface BussinessLocalTypeService { List filterList(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest); + List filterUnBind(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest); + List filterJoin(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest); BussinessLocalTypeEntity findBTByAction(String action); diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BussinessLocalTypeServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BussinessLocalTypeServiceImpl.java index 0b5fbb60..92573937 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BussinessLocalTypeServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BussinessLocalTypeServiceImpl.java @@ -37,6 +37,11 @@ public class BussinessLocalTypeServiceImpl implements BussinessLocalTypeService return data; } + @Override + public List filterUnBind(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest) { + return bussinessLocalTypeDao.filterUnBind(bussinessTypeFilterRequest); + } + @Override public List filterJoin(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest) { if (bussinessTypeFilterRequest == null) { diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/info/CompanyProductRelevanceService.java b/api-admin/src/main/java/com/glxp/api/admin/service/info/CompanyProductRelevanceService.java new file mode 100644 index 00000000..13865e17 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/info/CompanyProductRelevanceService.java @@ -0,0 +1,36 @@ +package com.glxp.api.admin.service.info; + + +import com.glxp.api.admin.entity.basic.CompanyProductRelevanceEntity; +import com.glxp.api.admin.req.basic.CompanyProductRelevanceRequest; +import com.glxp.api.admin.req.basic.FilterCompanyProductRelevanceRequest; +import com.glxp.api.admin.res.info.CompanyProductRelevanceResponse; + +import java.util.List; + +public interface CompanyProductRelevanceService { + + List filterUdiGp(CompanyProductRelevanceRequest basicInstrumentMaintainRequest); + + List filterCompanyProductRelevance(FilterCompanyProductRelevanceRequest filterCompanyProductRelevanceRequest); + + CompanyProductRelevanceEntity findCompanyProductRelevance(Long CustomerId); + + CompanyProductRelevanceEntity findCompanyProductRelevanceByProductId(String productId); + + CompanyProductRelevanceEntity findCompanyProductRelevanceByUdiRlIdFk(String udiRlIdFk, String customerId); + + CompanyProductRelevanceEntity findByUdiRlIdUnitFk(String udiRlIdFk, String unitFk); + + CompanyProductRelevanceEntity findCompanyProductRelevanceByProductUuid(CompanyProductRelevanceEntity companyProductRelevanceEntity); + + List getCompanyProductRelevance(FilterCompanyProductRelevanceRequest filterCompanyProductRelevanceRequest); + + boolean updateCompanyProductRelevance(CompanyProductRelevanceEntity companyCertEntity); + + boolean insertCompanyProductRelevance(CompanyProductRelevanceEntity companyCertEntity); + + boolean deleteById(String id); + + boolean deleteByRlId(String id); +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/info/impl/CompanyProductRelevanceServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/info/impl/CompanyProductRelevanceServiceImpl.java new file mode 100644 index 00000000..c7e8c244 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/info/impl/CompanyProductRelevanceServiceImpl.java @@ -0,0 +1,110 @@ +package com.glxp.api.admin.service.info.impl; + +import com.github.pagehelper.PageHelper; +import com.glxp.api.admin.dao.basic.CompanyProductRelevanceDao; +import com.glxp.api.admin.entity.basic.CompanyProductRelevanceEntity; +import com.glxp.api.admin.req.basic.CompanyProductRelevanceRequest; +import com.glxp.api.admin.req.basic.FilterCompanyProductRelevanceRequest; +import com.glxp.api.admin.res.info.CompanyProductRelevanceResponse; +import com.glxp.api.admin.service.info.CompanyProductRelevanceService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class CompanyProductRelevanceServiceImpl implements CompanyProductRelevanceService { + + @Resource + CompanyProductRelevanceDao companyProductRelevanceDao; + + @Override + public List filterUdiGp(CompanyProductRelevanceRequest basicInstrumentMaintainRequest) { + if (basicInstrumentMaintainRequest == null) { + return Collections.emptyList(); + } + if (basicInstrumentMaintainRequest.getPage() != null) { + int offset = (basicInstrumentMaintainRequest.getPage() - 1) * basicInstrumentMaintainRequest.getLimit(); + PageHelper.offsetPage(offset, basicInstrumentMaintainRequest.getLimit()); + } + + List data = companyProductRelevanceDao.filterUdiGp(basicInstrumentMaintainRequest); + return data; + } + + @Override + public List filterCompanyProductRelevance(FilterCompanyProductRelevanceRequest filterCompanyProductRelevanceRequest) { + if (filterCompanyProductRelevanceRequest == null) { + return Collections.emptyList(); + } + if (filterCompanyProductRelevanceRequest.getPage() != null) { + int offset = (filterCompanyProductRelevanceRequest.getPage() - 1) * filterCompanyProductRelevanceRequest.getLimit(); + PageHelper.offsetPage(offset, filterCompanyProductRelevanceRequest.getLimit()); + } + return companyProductRelevanceDao.filterCompanyProductRelevance(filterCompanyProductRelevanceRequest); + } + + @Override + public CompanyProductRelevanceEntity findCompanyProductRelevance(Long CustomerId) { + return companyProductRelevanceDao.findCompanyProductRelevance(CustomerId); + } + + @Override + public List getCompanyProductRelevance(FilterCompanyProductRelevanceRequest filterCompanyProductRelevanceRequest) { + if (filterCompanyProductRelevanceRequest == null) { + return Collections.emptyList(); + } + int offset = (filterCompanyProductRelevanceRequest.getPage() - 1) * filterCompanyProductRelevanceRequest.getLimit(); + PageHelper.offsetPage(offset, filterCompanyProductRelevanceRequest.getLimit()); + List companyEntities = companyProductRelevanceDao.getCompanyProductRelevance(filterCompanyProductRelevanceRequest); + return companyEntities; + } + + @Override + public CompanyProductRelevanceEntity findCompanyProductRelevanceByProductId(String productId) { + return companyProductRelevanceDao.findCompanyProductRelevanceByProductId(productId); + } + + @Override + public CompanyProductRelevanceEntity findCompanyProductRelevanceByUdiRlIdFk(String udiRlIdFk, String customerId) { + return companyProductRelevanceDao.findCompanyProductRelevanceByUdiRlIdFk(udiRlIdFk, customerId); + } + + @Override + public CompanyProductRelevanceEntity findByUdiRlIdUnitFk(String udiRlIdFk, String unitFk) { + FilterCompanyProductRelevanceRequest filterCompanyProductRelevanceRequest = new FilterCompanyProductRelevanceRequest(); + filterCompanyProductRelevanceRequest.setUdiRlIdFk(udiRlIdFk); + filterCompanyProductRelevanceRequest.setUnitFk(unitFk); + List companyProductRelevanceEntities = companyProductRelevanceDao.filterCompanyProductRelevance(filterCompanyProductRelevanceRequest); + if (companyProductRelevanceEntities.size() > 0) { + return companyProductRelevanceEntities.get(0); + } + return null; + } + + @Override + public CompanyProductRelevanceEntity findCompanyProductRelevanceByProductUuid(CompanyProductRelevanceEntity companyProductRelevanceEntity) { + return companyProductRelevanceDao.findCompanyProductRelevanceByProductUuid(companyProductRelevanceEntity); + } + + @Override + public boolean updateCompanyProductRelevance(CompanyProductRelevanceEntity companyProductRelevanceEntity) { + return companyProductRelevanceDao.updateCompanyProductRelevance(companyProductRelevanceEntity); + } + + @Override + public boolean insertCompanyProductRelevance(CompanyProductRelevanceEntity companyProductRelevanceEntity) { + return companyProductRelevanceDao.insertCompanyProductRelevance(companyProductRelevanceEntity); + } + + @Override + public boolean deleteById(String id) { + return companyProductRelevanceDao.deleteById(id); + } + + @Override + public boolean deleteByRlId(String id) { + return companyProductRelevanceDao.deleteByRlId(id); + } +} 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 e2a83d27..d18985b1 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessLocalTypeDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessLocalTypeDao.xml @@ -23,12 +23,35 @@ + + @@ -73,11 +101,15 @@ - DELETE FROM basic_bustype_local WHERE id = #{id} + DELETE + FROM basic_bustype_local + WHERE id = #{id} diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml index f97d21c5..c793decf 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml @@ -72,7 +72,7 @@ (`index`,action,name,enable,remark,mainAction,localAction,thirdSysFk ,checkEnable,genUnit,innerOrder,secCheckEnable, checkUdims,checkPdaEd,checkPdaUn,checkPc,checkWebNew,checkChange - ,secCheckUdims,secCheckPdaEd,secCheckPdaUn,secCheckPc,secCheckWebNew,secCheckChange,checkSp,secCheckSp,thirdAction) + ,secCheckUdims,secCheckPdaEd,secCheckPdaUn,secCheckPc,secCheckWebNew,secCheckChange,checkSp,secCheckSp,thirdAction,storageCode,corpType) values ( #{index}, @@ -101,7 +101,8 @@ #{secCheckChange}, #{checkSp}, #{secCheckSp}, - #{thirdAction} + #{thirdAction}, + #{storageCode},#{corpType} ) @@ -113,7 +114,7 @@ (`index`,action,name,enable,remark,mainAction,localAction,thirdSysFk ,checkEnable,genUnit,innerOrder,secCheckEnable, checkUdims,checkPdaEd,checkPdaUn,checkPc,checkWebNew,checkChange - ,secCheckUdims,secCheckPdaEd,secCheckPdaUn,secCheckPc,secCheckWebNew,secCheckChange,checkSp,secCheckSp,thirdAction) + ,secCheckUdims,secCheckPdaEd,secCheckPdaUn,secCheckPc,secCheckWebNew,secCheckChange,checkSp,secCheckSp,thirdAction,storageCode,corpType) values ( #{index}, @@ -142,7 +143,8 @@ #{secCheckChange}, #{checkSp}, #{secCheckSp}, - #{thirdAction} + #{thirdAction}, + #{storageCode},#{corpType} ) @@ -176,7 +178,8 @@ secCheckSp=#{secCheckSp}, index=#{index}, thirdAction=#{thirdAction}, - + storageCode=#{storageCode}, + corpType=#{corpType}, thirdSysFk=#{thirdSysFk}, WHERE id = #{id} diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/CompanyProductRelevanceDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/CompanyProductRelevanceDao.xml new file mode 100644 index 00000000..4bee8ea9 --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/basic/CompanyProductRelevanceDao.xml @@ -0,0 +1,275 @@ + + + + + + + + + + + + + + + + + + + + + + + + UPDATE company_product_relevance + + customerId=#{customerId}, + name=#{name}, + tel=#{tel}, + phone=#{phone}, + create_time=#{create_time}, + update_time=#{update_time}, + auditStatus=#{auditStatus}, + productUuid=#{productUuid}, + udiRlIdFk=#{udiRlIdFk}, + unitFk=#{unitFk}, + + + WHERE id = #{id} + + + + replace + INTO company_product_relevance(customerId,productId,enterpriseId,registrationId, + create_time,update_time,auditStatus,productUuid,udiRlIdFk,unitFk) values + ( + #{customerId}, + #{productId}, + #{enterpriseId}, + #{registrationId}, + #{create_time}, + #{update_time}, + #{auditStatus}, + #{productUuid}, + #{udiRlIdFk}, + #{unitFk} + ) + + + + replace + INTO company_product_relevance(id,customerId,productId,enterpriseId,registrationId, + create_time,update_time,auditStatus,productUuid,udiRlIdFk,unitFk) values + ( + #{id}, + #{customerId}, + #{productId}, + #{enterpriseId}, + #{registrationId}, + #{create_time}, + #{update_time}, + #{auditStatus}, + #{productUuid}, + #{udiRlIdFk}, + #{unitFk} + ) + + + + DELETE + FROM company_product_relevance + WHERE id = #{id} + + + + + DELETE + FROM company_product_relevance + WHERE udiRlIdFk = #{id} + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml b/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml index eb43ef6c..d9ef257e 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml @@ -66,10 +66,9 @@ fromType=#{fromType}, contrastStatus=#{contrastStatus}, erpFk=#{erpFk}, - signStatus=#{signStatus} - stockCheckFk=#{stockCheckFk} - locStorageCode=#{locStorageCode} - + signStatus=#{signStatus}, + stockCheckFk=#{stockCheckFk}, + locStorageCode=#{locStorageCode}, WHERE id = #{id}