From 9cf676d4a999952963ac3703b80efb1aa93f0fe5 Mon Sep 17 00:00:00 2001 From: liux <963924687@qq.com> Date: Fri, 8 Aug 2025 14:50:51 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E9=93=BE=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ImsInventoryController.java | 8 +++ .../ims/domain/SupplierQualification.java | 13 +++- .../param/ImsIntoInventoryDetailAdd.java | 3 + .../vo/SupplierCategoryAndSupplier.java | 44 ++++++++++++ .../core/ims/dto/ExpireWarningDTO.java | 22 ++++++ .../canteen/core/ims/dto/SupplierEditDTO.java | 2 +- .../ims/dto/SupplierQualificationAddDTO.java | 2 +- .../ims/dto/SupplierQualificationPageDTO.java | 25 +++++++ .../core/ims/enums/QualificationTypeEnum.java | 68 +++++++++++++++++++ .../ims/mapper/SupplierCategoryMapper.java | 5 ++ .../ims/service/ICheckInventoryService.java | 2 + .../ims/service/ISupplierCategoryService.java | 5 ++ .../impl/CheckInventoryServiceImpl.java | 6 ++ .../impl/ImsOutInventoryServiceImpl.java | 4 +- .../impl/SupplierCategoryServiceImpl.java | 15 ++++ .../SupplierQualificationServiceImpl.java | 4 ++ .../impl/SupplierScoreRuleServiceImpl.java | 4 ++ .../ims/service/impl/SupplierServiceImpl.java | 19 ++++++ .../ims/vo/ReportInventoryOutDetailVO.java | 10 +-- .../canteen/core/ims/vo/SupplierPageVO.java | 9 +-- .../vo/SupplierQualificationDetailPageVO.java | 10 +++ .../mapper/ims/ImsInventoryMapper.xml | 2 + .../mapper/ims/ImsOutInventoryMapper.xml | 10 +-- .../mapper/ims/ReportInventoryMapper.xml | 2 + .../mapper/ims/SupplierCategoryMapper.xml | 42 +++++++++++- .../resources/mapper/ims/SupplierMapper.xml | 4 +- .../ims/SupplierQualificationMapper.xml | 8 ++- 27 files changed, 324 insertions(+), 24 deletions(-) create mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/vo/SupplierCategoryAndSupplier.java create mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/enums/QualificationTypeEnum.java diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/controller/ImsInventoryController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/controller/ImsInventoryController.java index f1ca0d1..90d9a50 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/controller/ImsInventoryController.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/controller/ImsInventoryController.java @@ -1,5 +1,7 @@ package com.bonus.canteen.core.ims.controller; +import java.util.ArrayList; +import java.util.Collections; import java.util.List; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; @@ -141,6 +143,12 @@ public class ImsInventoryController extends BaseController @ApiOperation("过期预警") public TableDataInfo expireWarning(ExpireWarningDTO content) { startPage(); + if(content !=null && content.getAreaId() != null ) { + content.setAreaIdList(Collections.singletonList(content.getAreaId())); + } + if(content !=null && content.getWarehouseId() != null ) { + content.setWarehouseIdList(Collections.singletonList(content.getWarehouseId())); + } List inventoryWarningList = this.imsInventoryService.expireWarning(content); return getDataTable(inventoryWarningList); } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/SupplierQualification.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/SupplierQualification.java index 60c7cad..0b9b219 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/SupplierQualification.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/SupplierQualification.java @@ -1,16 +1,19 @@ package com.bonus.canteen.core.ims.domain; import java.util.Date; + +import com.bonus.canteen.core.common.utils.FileUrlUtil; import com.fasterxml.jackson.annotation.JsonFormat; import com.bonus.common.core.annotation.Excel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.Getter; import lombok.ToString; import com.bonus.common.core.web.domain.BaseEntity; /** * 供应商资质对象 ims_supplier_qualification - * + * * @author xsheng * @date 2025-06-30 */ @@ -50,15 +53,16 @@ public class SupplierQualification extends BaseEntity { private Long certId; /** 资质照片 */ + @Getter @Excel(name = "资质照片") @ApiModelProperty(value = "资质照片") private String imgUrl; /** 有效期 */ @ApiModelProperty(value = "有效期") - @JsonFormat(pattern = "yyyy-MM-dd") +// @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "有效期", width = 30, dateFormat = "yyyy-MM-dd") - private Date expirationDate; + private String expirationDate; /** 主次(1主，2次) */ @Excel(name = "主次(1主，2次)") @@ -66,4 +70,7 @@ public class SupplierQualification extends BaseEntity { private Long mainFlag; + public void setImgUrl(String imgUrl) { + this.imgUrl = FileUrlUtil.getFileUrl(imgUrl); + } } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/param/ImsIntoInventoryDetailAdd.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/param/ImsIntoInventoryDetailAdd.java index 0fa78f6..868917e 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/param/ImsIntoInventoryDetailAdd.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/param/ImsIntoInventoryDetailAdd.java @@ -8,6 +8,7 @@ import lombok.Data; import lombok.ToString; import org.checkerframework.checker.units.qual.N; +import javax.validation.constraints.Max; import javax.validation.constraints.Min; import javax.validation.constraints.NotNull; import java.io.Serializable; @@ -62,6 +63,7 @@ public class ImsIntoInventoryDetailAdd implements Serializable @ApiModelProperty(value = "单价") @NotNull(message = "单价不能为空") @Min(value = 0, message = "单价不能小于0") + @Max(value = 9999, message = "单价不能大于9999") private Long unitPrice; /** 总价 */ @@ -78,6 +80,7 @@ public class ImsIntoInventoryDetailAdd implements Serializable @ApiModelProperty(value = "入库合格数量") @NotNull(message = "入库合格数量不能为空") @Min(value = 0, message = "入库合格数量不能小于0") + @Max(value = 9999, message = "入库合格数量不能大于9999") private BigDecimal purNum; /** 不合格数量 */ diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/vo/SupplierCategoryAndSupplier.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/vo/SupplierCategoryAndSupplier.java new file mode 100644 index 0000000..46654f4 --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/vo/SupplierCategoryAndSupplier.java @@ -0,0 +1,44 @@ +package com.bonus.canteen.core.ims.domain.vo; + +import com.bonus.common.core.annotation.Excel; +import com.bonus.common.core.web.domain.BaseEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.ToString; + +/** + * 供应商类目关联对象 ims_supplier_category + * + * @author xsheng + * @date 2025-06-30 + */ + + +@Data +@ToString +public class SupplierCategoryAndSupplier extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** 主键id */ + private Long id; + + /** 供应商id */ + @Excel(name = "供应商id") + @ApiModelProperty(value = "供应商id") + private Long supplierId; + + @Excel(name = "供应商名称") + @ApiModelProperty(value = "供应商名称") + private String supplierName; + + /** 类目id */ + @Excel(name = "类目id") + @ApiModelProperty(value = "类目id") + private Long categoryId; + + @Excel(name = "类目名称") + @ApiModelProperty(value = "类目名称") + private String materialName; + + +} diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/dto/ExpireWarningDTO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/dto/ExpireWarningDTO.java index c09566b..a6e1e95 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/dto/ExpireWarningDTO.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/dto/ExpireWarningDTO.java @@ -22,6 +22,28 @@ public class ExpireWarningDTO { @ApiModelProperty("导出字段") private List exportCols; + @ApiModelProperty("区域id") + private Long areaId; + + @ApiModelProperty("仓库id") + private Long warehouseId; + + + public Long getWarehouseId() { + return warehouseId; + } + + public void setWarehouseId(Long warehouseId) { + this.warehouseId = warehouseId; + } + + public Long getAreaId() { + return areaId; + } + + public void setAreaId(Long areaId) { + this.areaId = areaId; + } public String getMaterialName() { return this.materialName; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/dto/SupplierEditDTO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/dto/SupplierEditDTO.java index 0444780..bded9c9 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/dto/SupplierEditDTO.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/dto/SupplierEditDTO.java @@ -30,7 +30,7 @@ public class SupplierEditDTO { @ApiModelProperty("主要联系人") private String linkman; @ApiModelProperty("主要联系人电话") - private String linkmanNumber; + private String linkmanPhone; @ApiModelProperty("主要邮箱") private String email; @ApiModelProperty("主要微信号") diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/dto/SupplierQualificationAddDTO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/dto/SupplierQualificationAddDTO.java index 507f7c1..c535d16 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/dto/SupplierQualificationAddDTO.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/dto/SupplierQualificationAddDTO.java @@ -21,7 +21,7 @@ public class SupplierQualificationAddDTO { @ApiModelProperty("资质类型(1-营业执照,2-ISO9001国际质量体系认证,3-食品经营许可证,4-烟草经营许可证,5-HACCP认证)") private Long qualificationType; @ApiModelProperty("有效期") - private LocalDate expirationDate; + private String expirationDate; @ApiModelProperty("资质照片") private String imgUrl; @ApiModelProperty("主次(1主，2次)") diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/dto/SupplierQualificationPageDTO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/dto/SupplierQualificationPageDTO.java index aa4ae8f..1a2fa92 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/dto/SupplierQualificationPageDTO.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/dto/SupplierQualificationPageDTO.java @@ -15,6 +15,8 @@ public class SupplierQualificationPageDTO { private String qualificationName; @ApiModelProperty("供应商id") private Long supplierId; + @ApiModelProperty("供应商名称") + private String supplierName; @ApiModelProperty("主次资质类型") private Integer mainFlag; @ApiModelProperty("小于30,1是 2否") @@ -22,6 +24,29 @@ public class SupplierQualificationPageDTO { @ApiModelProperty("区域id列表") private List areaIdList; + @ApiModelProperty("区域id") + private Long areaId; + + public Long getAreaId() { + return areaId; + } + + public void setAreaId(Long areaId) { + this.areaId = areaId; + } + + public void setQualificationCode(String qualificationCode) { + this.qualificationCode = qualificationCode; + } + + public String getSupplierName() { + return supplierName; + } + + public void setSupplierName(String supplierName) { + this.supplierName = supplierName; + } + public Long getCurrent() { return this.current; } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/enums/QualificationTypeEnum.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/enums/QualificationTypeEnum.java new file mode 100644 index 0000000..eb5b4f8 --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/enums/QualificationTypeEnum.java @@ -0,0 +1,68 @@ +package com.bonus.canteen.core.ims.enums; + +import com.google.common.collect.Lists; + +import java.util.List; + +public enum QualificationTypeEnum { + BUSINESS(1L, "营业执照"), + ISO(2L, "ISO9001国际质量体系认证"), + FOOD(3L, "食品经营许可证"), + SMOKE(4L, "烟草经营许可证"), + HACCP(5L, "HACCP认证"); + + private final Long key; + private final String value; + + private QualificationTypeEnum(Long key, String value) { + this.key = key; + this.value = value; + } + + public static Long getKey(String value) { + QualificationTypeEnum[] enums = values(); + QualificationTypeEnum[] var2 = enums; + int var3 = enums.length; + + for(int var4 = 0; var4 < var3; ++var4) { + QualificationTypeEnum temp = var2[var4]; + if (temp.value().equals(value)) { + return temp.key(); + } + } + + return null; + } + + public static String getValue(Long key) { + QualificationTypeEnum[] enums = values(); + QualificationTypeEnum[] var2 = enums; + int var3 = enums.length; + + for(int var4 = 0; var4 < var3; ++var4) { + QualificationTypeEnum temp = var2[var4]; + if (temp.key().equals(key)) { + return temp.value(); + } + } + + return null; + } + + public Long key() { + return this.key; + } + + public String value() { + return this.value; + } + + public static List listOverAndNotEnough() { + return Lists.newArrayList(new Long[]{BUSINESS.key, ISO.key,FOOD.key,SMOKE.key,HACCP.key}); + } + + // $FF: synthetic method + private static QualificationTypeEnum[] $values() { + return new QualificationTypeEnum[]{BUSINESS, ISO, FOOD,SMOKE, HACCP}; + } +} diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/mapper/SupplierCategoryMapper.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/mapper/SupplierCategoryMapper.java index 7e75f8e..f41b016 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/mapper/SupplierCategoryMapper.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/mapper/SupplierCategoryMapper.java @@ -2,6 +2,7 @@ package com.bonus.canteen.core.ims.mapper; import java.util.List; import com.bonus.canteen.core.ims.domain.SupplierCategory; +import com.bonus.canteen.core.ims.domain.vo.SupplierCategoryAndSupplier; import com.bonus.canteen.core.ims.model.CategoryModel; /** @@ -62,4 +63,8 @@ public interface SupplierCategoryMapper { void deleteSupplierCategoryBySupplierId(Long supplierId); List selectNameBySupplier(Long supplierId); + + List selectSupplierCategoryBySupplierId(Long supplierId); + + List selectSupplierCategoryByCategoryId(Long categoryId); } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/ICheckInventoryService.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/ICheckInventoryService.java index ae56fdf..5524f40 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/ICheckInventoryService.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/ICheckInventoryService.java @@ -81,4 +81,6 @@ public interface ICheckInventoryService { void removeByCheckId(Integer checkId); List getDrpCkeckInventoryPage(CheckInventoryPageDTO content); + + } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/ISupplierCategoryService.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/ISupplierCategoryService.java index 93e21f7..948e22d 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/ISupplierCategoryService.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/ISupplierCategoryService.java @@ -2,6 +2,7 @@ package com.bonus.canteen.core.ims.service; import java.util.List; import com.bonus.canteen.core.ims.domain.SupplierCategory; +import com.bonus.canteen.core.ims.domain.vo.SupplierCategoryAndSupplier; import com.bonus.canteen.core.ims.model.CategoryModel; /** @@ -19,6 +20,10 @@ public interface ISupplierCategoryService { */ public SupplierCategory selectSupplierCategoryById(Long id); + List selectSupplierCategoryBySupplierId(Long id); + + List selectSupplierCategoryByCategoryId(Long id); + /** * 查询供应商类目关联列表 * diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/CheckInventoryServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/CheckInventoryServiceImpl.java index 344ef35..f6c83ab 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/CheckInventoryServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/CheckInventoryServiceImpl.java @@ -176,6 +176,11 @@ public class CheckInventoryServiceImpl implements ICheckInventoryService { @Override public CheckInventoryAddVO addCommitCheckInventory(CheckInventoryDraftAddDTO content) { + + if(ObjectUtil.isEmpty(content.getFirstCheckUser())) { + throw new ServiceException("盘点员不能为空"); + } + CheckInventory checkInventory = new CheckInventory(); BeanUtil.copyProperties(content, checkInventory, new String[0]); checkInventory.setCreateBy(SecurityUtils.getUsername()); @@ -372,4 +377,5 @@ public class CheckInventoryServiceImpl implements ICheckInventoryService { } + } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/ImsOutInventoryServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/ImsOutInventoryServiceImpl.java index 1289eb3..2a97a7e 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/ImsOutInventoryServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/ImsOutInventoryServiceImpl.java @@ -341,7 +341,9 @@ public class ImsOutInventoryServiceImpl implements IImsOutInventoryService imsOutInventory.setImsOutInventoryDetailList(list); } imsOutInventoryMapper.updateImsOutInventory(imsOutInventory); - this.addOutImsReportInventoryMessage(imsOutInventory); + if(imsOutInventory.getStatus()== 2L){ + this.addOutImsReportInventoryMessage(imsOutInventory); + } return imsOutInventory; } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/SupplierCategoryServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/SupplierCategoryServiceImpl.java index 6d9a80d..12509ec 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/SupplierCategoryServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/SupplierCategoryServiceImpl.java @@ -2,6 +2,7 @@ package com.bonus.canteen.core.ims.service.impl; import java.util.List; +import com.bonus.canteen.core.ims.domain.vo.SupplierCategoryAndSupplier; import com.bonus.canteen.core.ims.model.CategoryModel; import com.bonus.common.core.exception.ServiceException; import com.bonus.common.core.utils.DateUtils; @@ -22,12 +23,26 @@ public class SupplierCategoryServiceImpl implements ISupplierCategoryService { @Autowired private SupplierCategoryMapper supplierCategoryMapper; + @Override + public List selectSupplierCategoryBySupplierId(Long id) { + return supplierCategoryMapper.selectSupplierCategoryBySupplierId(id); + } + + @Override + public List selectSupplierCategoryByCategoryId(Long id) { + return supplierCategoryMapper.selectSupplierCategoryByCategoryId(id); + } + /** * 查询供应商类目关联 * * @param id 供应商类目关联主键 * @return 供应商类目关联 */ + + + + @Override public SupplierCategory selectSupplierCategoryById(Long id) { return supplierCategoryMapper.selectSupplierCategoryById(id); diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/SupplierQualificationServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/SupplierQualificationServiceImpl.java index a62ee11..413d4a3 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/SupplierQualificationServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/SupplierQualificationServiceImpl.java @@ -2,6 +2,7 @@ package com.bonus.canteen.core.ims.service.impl; import java.time.Duration; import java.time.LocalDateTime; +import java.util.Collections; import java.util.List; import com.bonus.canteen.core.ims.dto.SupplierQualificationPageDTO; @@ -108,6 +109,9 @@ public class SupplierQualificationServiceImpl implements ISupplierQualificationS @Override public List earlyWarning(SupplierQualificationPageDTO supplierQualification) { + if (supplierQualification != null && supplierQualification.getAreaId() != null) { + supplierQualification.setAreaIdList(Collections.singletonList(supplierQualification.getAreaId())); + } List list = supplierQualificationMapper.earlyWarning(supplierQualification); if(list !=null && list.size() >0 ) { list.forEach(item->{ diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/SupplierScoreRuleServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/SupplierScoreRuleServiceImpl.java index 5569e5f..84677dc 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/SupplierScoreRuleServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/SupplierScoreRuleServiceImpl.java @@ -35,6 +35,7 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.math.BigDecimal; import java.util.ArrayList; +import java.util.Collections; import java.util.Iterator; import java.util.List; @@ -162,6 +163,9 @@ public class SupplierScoreRuleServiceImpl extends ServiceImpl pageSupplierScoreRule(SupplierScoreDTO content) { + if (content != null && content.getAreaId() != null) { + content.setAreaIdList(Collections.singletonList(content.getAreaId())); + } List resultList = this.supplierMapper.selectSupplier(content, DelFlagEnum.DEL_FALSE.key()); Iterator var3 = resultList.iterator(); diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/SupplierServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/SupplierServiceImpl.java index 52729d8..bd5535b 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/SupplierServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/SupplierServiceImpl.java @@ -15,7 +15,9 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.bonus.canteen.core.ims.domain.SupplierCategory; import com.bonus.canteen.core.ims.domain.SupplierQualification; +import com.bonus.canteen.core.ims.domain.vo.SupplierCategoryAndSupplier; import com.bonus.canteen.core.ims.dto.*; +import com.bonus.canteen.core.ims.enums.QualificationTypeEnum; import com.bonus.canteen.core.ims.model.CategoryModel; import com.bonus.canteen.core.ims.service.*; import com.bonus.canteen.core.ims.vo.SupplierDeliverVO; @@ -54,6 +56,7 @@ public class SupplierServiceImpl extends ServiceImpl @Resource private ISupplierQualificationService supplierQualificationService; + /** * 查询供应商信息 * @@ -174,6 +177,7 @@ public class SupplierServiceImpl extends ServiceImpl supplierQualification.setCreateTime(DateUtils.getNowDate()); supplierQualification.setMainFlag(flag); supplierQualification.setCreateBy(SecurityUtils.getUserId()+""); + supplierQualification.setQualificationType(QualificationTypeEnum.getKey(qualification.getQualificationName() ==null ? "营业执照" : qualification.getQualificationName())); supplierQualificationService.insertSupplierQualification(supplierQualification); } } @@ -241,6 +245,21 @@ public class SupplierServiceImpl extends ServiceImpl */ @Override public int deleteSupplierBySupplierIds(Long[] supplierIds) { + //supplierCategoryServiceImpl + List allList = new ArrayList<>(); + for (Long supplierId : supplierIds) { + List supplierCategoryList = supplierCategoryService.selectSupplierCategoryBySupplierId(supplierId); + allList.addAll(supplierCategoryList); + } + if(allList !=null && allList.size()>0){ + String distinctNames = allList.stream() + .map(SupplierCategoryAndSupplier::getMaterialName) + .distinct() + .map(String::valueOf) + .collect(Collectors.joining(", ")); + throw new ServiceException("供应商已被类目【"+distinctNames+"】关联，不能删除"); + } + return supplierMapper.deleteSupplierBySupplierIds(supplierIds); } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/vo/ReportInventoryOutDetailVO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/vo/ReportInventoryOutDetailVO.java index 2ab4860..c13e8aa 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/vo/ReportInventoryOutDetailVO.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/vo/ReportInventoryOutDetailVO.java @@ -59,11 +59,13 @@ public class ReportInventoryOutDetailVO { private String supplierId; private String supplierName; - @ExcelProperty( - value = {"出库类型"}, - converter = OutTypeConverter.class - ) + @ApiModelProperty("出入库类型") + @ExcelProperty(value = {"出入库类型"},converter = OutTypeConverter.class) private Integer outType; + + @ApiModelProperty("类型 1入库 2出库") + private Integer recordType; + @ApiModelProperty("日期") @ExcelProperty({"出库时间"}) private LocalDateTime outDate; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/vo/SupplierPageVO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/vo/SupplierPageVO.java index 3e53730..29ee08a 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/vo/SupplierPageVO.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/vo/SupplierPageVO.java @@ -2,6 +2,7 @@ package com.bonus.canteen.core.ims.vo; import cn.hutool.core.text.CharSequenceUtil; import com.alibaba.fastjson.JSONObject; +import com.bonus.canteen.core.common.utils.FileUrlUtil; import com.bonus.canteen.core.ims.model.CategoryModel; import com.bonus.canteen.core.utils.SysUtil; import io.swagger.annotations.ApiModel; @@ -137,11 +138,11 @@ public class SupplierPageVO { } public String getIdCardImgZ() { - return SysUtil.getCutFileUrl(this.idCardImgZ); + return FileUrlUtil.getFileUrl(this.idCardImgZ); } public String getIdCardImgF() { - return SysUtil.getCutFileUrl(this.idCardImgF); + return FileUrlUtil.getFileUrl(this.idCardImgF); } public Long getSupplierId() { @@ -172,7 +173,7 @@ public class SupplierPageVO { return this.linkman; } - public String getLinkmanNumber() { + public String getLinkmanPhone() { return this.linkmanPhone; } @@ -352,7 +353,7 @@ public class SupplierPageVO { this.linkman = linkman; } - public void setLinkmanNumber(final String linkmanPhone) { + public void setLinkmanPhone(final String linkmanPhone) { this.linkmanPhone = linkmanPhone; } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/vo/SupplierQualificationDetailPageVO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/vo/SupplierQualificationDetailPageVO.java index 1adcf60..974ce90 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/vo/SupplierQualificationDetailPageVO.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/vo/SupplierQualificationDetailPageVO.java @@ -1,5 +1,6 @@ package com.bonus.canteen.core.ims.vo; +import com.bonus.canteen.core.common.utils.FileUrlUtil; import com.bonus.canteen.core.utils.SysUtil; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -24,5 +25,14 @@ public class SupplierQualificationDetailPageVO { private Long supplierId; @ApiModelProperty("关联证书库ID") private Long certId; + @ApiModelProperty("有效期") + private String expirationDate; + public String getImgUrl() { + return FileUrlUtil.getFileUrl(imgUrl); + } + + public void setImgUrl(String imgUrl) { + this.imgUrl = imgUrl; + } } diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/ImsInventoryMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/ImsInventoryMapper.xml index 40a0ab2..a6a673c 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/ImsInventoryMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/ImsInventoryMapper.xml @@ -223,6 +223,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LEFT JOIN cook_material_type mmc ON mmc.material_type_id = mm.material_type_id left join basic_area aa on aa.area_id = dw.area_id + mm.material_name is not null and mm.material_code is not null AND di.warehouse_id in @@ -238,6 +239,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and mm.material_name like #{content.materialName} + and inventory_status in (2, 3) diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/ImsOutInventoryMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/ImsOutInventoryMapper.xml index 48b6555..575f92d 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/ImsOutInventoryMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/ImsOutInventoryMapper.xml @@ -3,7 +3,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -104,9 +104,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and ioi.out_date #{endDateTime} - order by ioi.out_date desc + order by ioi.create_time desc - + - SELECT + SELECT DISTINCT mmc.material_type_id as categoryId, mmc.material_type_name as categoryName FROM @@ -92,4 +104,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where dsc.supplier_id = #{supplierId} + + + SELECT + id, + a.supplier_id, + b.supplier_name, + a.category_id, + c.material_name, + + a.create_by, + a.create_time, + a.update_by, + a.update_time + FROM + ims_supplier_bind_material a + LEFT JOIN ims_supplier b on a.supplier_id = b.supplier_id + LEFT JOIN cook_material c on c.material_id = a.material_id + + + + + diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/SupplierMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/SupplierMapper.xml index 1996c9d..2d670b3 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/SupplierMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/SupplierMapper.xml @@ -352,7 +352,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and a.supplier_code = #{content.supplierCode} - and a.supplier_name like #{content.supplierName} + and a.supplier_name like concat('%',#{content.supplierName},'%') AND a.area_id in @@ -361,7 +361,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - and a.linkman like #{content.linkman} + and a.linkman like concat('%',#{content.linkman},'%') and a.status = #{content.status} diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/SupplierQualificationMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/SupplierQualificationMapper.xml index 6b8fce9..7e6561b 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/SupplierQualificationMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/SupplierQualificationMapper.xml @@ -127,12 +127,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LEFT JOIN ims_supplier ds ON ds.supplier_id = dsq.supplier_id LEFT JOIN basic_area aa on ds.area_id = aa.area_id - - and dsq.qualification_code like concat('%', #{content.qualificationCode}, '%') + + and ds.supplier_name like concat('%', #{content.supplierName}, '%') + and dsq.qualification_name like concat('%', #{content.qualificationName}, '%') + + and dsq.qualification_code like concat('%', #{content.qualificationCode}, '%') + and ds.supplier_id = #{content.supplierId}