From bc31cda78817c62aa552be40f39eccaa03262923 Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期六, 07 十一月 2026 01:21:22 +0800
Subject: [PATCH] feat: 补齐排产约束与缺料校验,新增风险监测,优化隐患通知与招投标联动
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/risk/SafetyRiskSourceSaveReqVO.java | 17
.gitignore | 6
yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/api/returnsales/AfterSaleReturnSourceTest.java | 19 +
yudao-module-srm/src/test/java/cn/iocoder/yudao/module/srm/service/tender/SrmQuoteOwnershipTest.java | 49 ++
yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/tender/SrmTenderProjectServiceImpl.java | 9
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyHazardService.java | 10
yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/safety/SafetyRiskSourceServiceTest.java | 28 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/task/schedule/MesSchedulePriority.java | 13
yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesReturnInboundAfterSaleTest.java | 63 +++
yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/pd/knowledge/KnowledgeMatchTest.java | 37 +
yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/pd/knowledge/KnowledgeWriteServiceTest.java | 90 ++++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/SafetyErrorCodeConstants.java | 2
yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/collect/CollectOfflinePolicyTest.java | 36 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyRiskSourceController.java | 24 +
yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/item/vo/MdmItemSaveReqVO.java | 10
yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/SalesNoticeOrderGuardTest.java | 23 +
yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/tender/SrmPurchaseQuoteValidator.java | 31 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyRiskSourceService.java | 34 +
yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/item/vo/MdmItemRespVO.java | 8
yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptStatusListenerTest.java | 35 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/vo/MesProWorkOrderRespVO.java | 6
yudao-module-srm/src/test/java/cn/iocoder/yudao/module/srm/service/tender/SrmPurchaseQuoteValidationTest.java | 22 +
yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/tender/SrmBidAwardServiceImpl.java | 9
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/hazard/SafetyHazardAssignReqVO.java | 3
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/task/schedule/MesProBatchScheduleService.java | 59 ++
yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/pro/task/schedule/MesSchedulePriorityTest.java | 15
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/task/schedule/MesScheduleMaterialCheck.java | 24 +
yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesReturnQualityAfterSaleTest.java | 74 +++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/workorder/MesProWorkOrderDO.java | 6
yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/dal/dataobject/item/MdmItemDO.java | 5
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/vo/MesProWorkOrderSaveReqVO.java | 9
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyRiskSourceDO.java | 24 +
yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/safety/SafetyDocumentPolicyTest.java | 12
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyRiskThreshold.java | 10
yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/pro/task/schedule/MesScheduleMaterialCheckTest.java | 23 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/SafetyRiskSourceMapper.java | 5
yudao-module-srm/src/test/java/cn/iocoder/yudao/module/srm/service/tender/SrmTenderConfigServiceTest.java | 21 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/listener/MesWmItemReceiptStatusListener.java | 7
yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/safety/SafetyHazardNoticeTest.java | 100 +++++
yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/pd/knowledge/KnowledgeSearchServiceTest.java | 86 ++++
yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/safety/SafetyRiskThresholdTest.java | 18
41 files changed, 1,061 insertions(+), 21 deletions(-)
diff --git a/.gitignore b/.gitignore
index 2c46605..e55d55b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -61,7 +61,11 @@
######################################################################
# AI / Personal Docs锛堜釜浜哄伐浣滄枃妗o紝涓嶇撼鍏ョ増鏈帶鍒讹級
-/docs/
+# 鐢� /docs/* 鑰岄潪 /docs/锛屽惁鍒� git 涓嶈繘鍏ョ洰褰曪紝鐩綍鍐呯殑渚嬪瑙勫垯鏃犳硶鐢熸晥
+/docs/*
+# 渚嬪锛歞ocs/sql 涓嬬殑鏁版嵁搴撹縼绉昏剼鏈睘浜庝氦浠樼墿锛屽繀椤诲叆搴�
+!/docs/sql/
+!/docs/sql/**/*.sql
/TODO.md
/fix_quartz_and_issues.md
diff --git a/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/item/vo/MdmItemRespVO.java b/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/item/vo/MdmItemRespVO.java
index b9709d3..ae79448 100644
--- a/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/item/vo/MdmItemRespVO.java
+++ b/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/item/vo/MdmItemRespVO.java
@@ -94,6 +94,12 @@
@Schema(description = "鏈�楂樺簱瀛�", example = "500")
private BigDecimal maxStock;
+ @Schema(description = "閲囪喘鎻愬墠鏈燂紙澶╋級")
+ private Integer leadTime;
+
+ @Schema(description = "澶栧崗鎻愬墠鏈燂紙澶╋級")
+ private Integer outsourceLeadTime;
+
@Schema(description = "淇濊川鏈熷ぉ鏁�", example = "365")
private Integer expiryDay;
@@ -138,4 +144,4 @@
@Schema(description = "鍒涘缓鏃堕棿", requiredMode = Schema.RequiredMode.REQUIRED)
private LocalDateTime createTime;
-}
\ No newline at end of file
+}
diff --git a/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/item/vo/MdmItemSaveReqVO.java b/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/item/vo/MdmItemSaveReqVO.java
index de0c38d..13710d4 100644
--- a/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/item/vo/MdmItemSaveReqVO.java
+++ b/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/item/vo/MdmItemSaveReqVO.java
@@ -72,6 +72,14 @@
@Schema(description = "鏈�楂樺簱瀛�", example = "500")
private BigDecimal maxStock;
+ @Schema(description = "閲囪喘鎻愬墠鏈燂紙澶╋級")
+ @jakarta.validation.constraints.Min(value = 0, message = "閲囪喘鎻愬墠鏈熶笉鑳戒负璐熸暟")
+ private Integer leadTime;
+
+ @Schema(description = "澶栧崗鎻愬墠鏈燂紙澶╋級")
+ @jakarta.validation.constraints.Min(value = 0, message = "澶栧崗鎻愬墠鏈熶笉鑳戒负璐熸暟")
+ private Integer outsourceLeadTime;
+
@Schema(description = "淇濊川鏈熷ぉ鏁�", example = "365")
private Integer expiryDay;
@@ -115,4 +123,4 @@
private Long mdmItemId;
-}
\ No newline at end of file
+}
diff --git a/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/dal/dataobject/item/MdmItemDO.java b/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/dal/dataobject/item/MdmItemDO.java
index 1b7f5c0..c8cd307 100644
--- a/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/dal/dataobject/item/MdmItemDO.java
+++ b/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/dal/dataobject/item/MdmItemDO.java
@@ -138,6 +138,9 @@
*/
private Integer leadTime;
+ /** 澶栧崗鎻愬墠鏈燂紙澶╋級锛涗负绌鸿〃绀烘湭閰嶇疆銆� */
+ private Integer outsourceLeadTime;
+
/**
* 鏄惁鎵规绠$悊
*/
@@ -213,4 +216,4 @@
*/
private String remark;
-}
\ No newline at end of file
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/vo/MesProWorkOrderRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/vo/MesProWorkOrderRespVO.java
index fac3404..14e190a 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/vo/MesProWorkOrderRespVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/vo/MesProWorkOrderRespVO.java
@@ -108,6 +108,12 @@
@ExcelProperty("闇�姹傛棩鏈�")
private LocalDateTime requestDate;
+ @Schema(description = "鎺掍骇浼樺厛绾э紝鏁板瓧瓒婂ぇ瓒婁紭鍏�")
+ private Integer schedulePriority;
+
+ @Schema(description = "甯傚満绫诲瀷锛欴OMESTIC 鍐呴攢锛孍XPORT 澶栭攢")
+ private String marketType;
+
@Schema(description = "鐖跺伐鍗曠紪鍙�", example = "0")
private Long parentId;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/vo/MesProWorkOrderSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/vo/MesProWorkOrderSaveReqVO.java
index a41d1f1..d19aba6 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/vo/MesProWorkOrderSaveReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/vo/MesProWorkOrderSaveReqVO.java
@@ -64,6 +64,15 @@
@NotNull(message = "闇�姹傛棩鏈熶笉鑳戒负绌�")
private LocalDateTime requestDate;
+ @Schema(description = "鎺掍骇浼樺厛绾э紝鑼冨洿 0 鑷� 100锛屾暟鍊艰秺澶ц秺浼樺厛")
+ @jakarta.validation.constraints.Min(0)
+ @jakarta.validation.constraints.Max(100)
+ private Integer schedulePriority;
+
+ @Schema(description = "甯傚満绫诲瀷锛欴OMESTIC 鍐呴攢锛孍XPORT 澶栭攢")
+ @jakarta.validation.constraints.Pattern(regexp = "DOMESTIC|EXPORT", message = "甯傚満绫诲瀷浠呮敮鎸佸唴閿�鎴栧閿�")
+ private String marketType;
+
@Schema(description = "鐖跺伐鍗曠紪鍙�", example = "0")
private Long parentId;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyRiskSourceController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyRiskSourceController.java
new file mode 100644
index 0000000..b301d81
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyRiskSourceController.java
@@ -0,0 +1,24 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety;
+import cn.iocoder.yudao.framework.common.pojo.*;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.risk.SafetyRiskSourceSaveReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.safety.SafetyRiskSourceDO;
+import cn.iocoder.yudao.module.mes.service.safety.SafetyRiskSourceService;
+import jakarta.annotation.Resource;
+import jakarta.validation.Valid;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+@RestController @RequestMapping("/safety/risk-source") @Validated
+public class SafetyRiskSourceController {
+ @Resource private SafetyRiskSourceService service;
+ @GetMapping("/page") @PreAuthorize("@ss.hasPermission('safety:risk:query')")
+ public CommonResult<PageResult<SafetyRiskSourceDO>> page(@Valid PageParam page,@RequestParam(value="name",required=false) String name){return success(service.page(page,name));}
+ @PostMapping("/create") @PreAuthorize("@ss.hasPermission('safety:risk:create')")
+ public CommonResult<Long> create(@Valid @RequestBody SafetyRiskSourceSaveReqVO req){req.setId(null);return success(service.save(req));}
+ @PutMapping("/update") @PreAuthorize("@ss.hasPermission('safety:risk:update')")
+ public CommonResult<Boolean> update(@Valid @RequestBody SafetyRiskSourceSaveReqVO req){if(req.getId()==null)throw cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.invalidParamException("鍗遍櫓婧愮紪鍙蜂笉鑳戒负绌�");service.save(req);return success(true);}
+ @DeleteMapping("/delete") @PreAuthorize("@ss.hasPermission('safety:risk:delete')")
+ public CommonResult<Boolean> delete(@RequestParam("id") Long id){service.delete(id);return success(true);}
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/hazard/SafetyHazardAssignReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/hazard/SafetyHazardAssignReqVO.java
index f763d0f..d7cf54d 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/hazard/SafetyHazardAssignReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/hazard/SafetyHazardAssignReqVO.java
@@ -26,6 +26,9 @@
@NotNull(message = "璇烽�夋嫨鏁存敼璐d换浜�")
private Long assigneeId;
+ @Schema(description = "鍛樺伐鏈粦瀹氳处鍙锋椂锛屾槑纭寚瀹氱殑閫氱煡鎺ユ敹璐﹀彿")
+ private Long notifyUserId;
+
@Schema(description = "鏁存敼鏈熼檺")
@DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
private LocalDate rectifyDeadline;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/risk/SafetyRiskSourceSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/risk/SafetyRiskSourceSaveReqVO.java
new file mode 100644
index 0000000..5e23583
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/risk/SafetyRiskSourceSaveReqVO.java
@@ -0,0 +1,17 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety.vo.risk;
+import jakarta.validation.constraints.*;
+import lombok.Data;
+import java.math.BigDecimal;
+
+@Data public class SafetyRiskSourceSaveReqVO {
+ private Long id;
+ @NotBlank @Size(max=120) private String name;
+ @NotBlank @Pattern(regexp="MAJOR|HIGH_VOLTAGE|OTHER") private String category;
+ @Size(max=160) private String location;
+ @NotBlank @Size(max=80) private String metricName;
+ @Size(max=32) private String unit;
+ @Digits(integer=14,fraction=6) private BigDecimal lowerLimit;
+ @Digits(integer=14,fraction=6) private BigDecimal upperLimit;
+ @Digits(integer=14,fraction=6) private BigDecimal currentValue;
+ @Size(max=500) private String remark;
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/workorder/MesProWorkOrderDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/workorder/MesProWorkOrderDO.java
index 85dd127..99c8c33 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/workorder/MesProWorkOrderDO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/workorder/MesProWorkOrderDO.java
@@ -123,6 +123,12 @@
* 闇�姹傛棩鏈�
*/
private LocalDateTime requestDate;
+
+ /** 鎺掍骇浼樺厛绾э紝鏁板�艰秺澶ц秺浼樺厛銆� */
+ private Integer schedulePriority;
+
+ /** 涓氬姟浜哄憳纭鐨勫唴澶栭攢鍒嗙被銆� */
+ private String marketType;
/**
* 鐖跺伐鍗曠紪鍙�
*
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyRiskSourceDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyRiskSourceDO.java
new file mode 100644
index 0000000..1dacca9
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyRiskSourceDO.java
@@ -0,0 +1,24 @@
+package cn.iocoder.yudao.module.mes.dal.dataobject.safety;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@TableName("safety_risk_source")
+@Data @EqualsAndHashCode(callSuper = true)
+public class SafetyRiskSourceDO extends BaseDO {
+ @TableId private Long id;
+ private String name;
+ private String category;
+ private String location;
+ private String metricName;
+ private String unit;
+ @TableField(updateStrategy = FieldStrategy.ALWAYS) private BigDecimal lowerLimit;
+ @TableField(updateStrategy = FieldStrategy.ALWAYS) private BigDecimal upperLimit;
+ @TableField(updateStrategy = FieldStrategy.ALWAYS) private BigDecimal currentValue;
+ @TableField(updateStrategy = FieldStrategy.ALWAYS) private LocalDateTime observedAt;
+ private String riskStatus;
+ private String remark;
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/SafetyRiskSourceMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/SafetyRiskSourceMapper.java
new file mode 100644
index 0000000..cc3c3c9
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/SafetyRiskSourceMapper.java
@@ -0,0 +1,5 @@
+package cn.iocoder.yudao.module.mes.dal.mysql.safety;
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.module.mes.dal.dataobject.safety.SafetyRiskSourceDO;
+import org.apache.ibatis.annotations.Mapper;
+@Mapper public interface SafetyRiskSourceMapper extends BaseMapperX<SafetyRiskSourceDO> {}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/SafetyErrorCodeConstants.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/SafetyErrorCodeConstants.java
index 810687b..d9a7250 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/SafetyErrorCodeConstants.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/SafetyErrorCodeConstants.java
@@ -35,7 +35,7 @@
ErrorCode SAFETY_HAZARD_STATUS_ERROR = new ErrorCode(1_040_964_001, "褰撳墠闅愭偅鐘舵�佷笉鍏佽璇ユ搷浣�");
ErrorCode SAFETY_HAZARD_ASSIGNEE_REQUIRED = new ErrorCode(1_040_964_002, "鍒嗘淳蹇呴』鎸囧畾鏁存敼璐d换浜�");
ErrorCode SAFETY_HAZARD_SAME_OPERATOR = new ErrorCode(1_040_964_003, "鏁存敼浜轰笌澶嶆煡浜轰笉鑳芥槸鍚屼竴浜�");
- ErrorCode SAFETY_HAZARD_ASSIGNEE_NO_ACCOUNT = new ErrorCode(1_040_964_004, "鏁存敼璐d换浜烘湭鍏宠仈绯荤粺璐﹀彿锛屾棤娉曞彂閫佹暣鏀归�氱煡");
+ ErrorCode SAFETY_HAZARD_ASSIGNEE_NO_ACCOUNT = new ErrorCode(1_040_964_004, "鏁存敼璐d换浜烘湭缁戝畾绯荤粺璐﹀彿锛岃閫夋嫨閫氱煡鎺ユ敹璐﹀彿");
ErrorCode SAFETY_HAZARD_NOTICE_UNAVAILABLE = new ErrorCode(1_040_964_005, "鏁存敼閫氱煡妯℃澘鏈惎鐢紝璇疯仈绯荤鐞嗗憳澶勭悊");
// ========== 楂樺嵄浣滀笟绁� 1_040_965_xxx ==========
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/task/schedule/MesProBatchScheduleService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/task/schedule/MesProBatchScheduleService.java
index c32c99d..1faa949 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/task/schedule/MesProBatchScheduleService.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/task/schedule/MesProBatchScheduleService.java
@@ -14,6 +14,13 @@
import cn.iocoder.yudao.module.mes.dal.mysql.pro.task.MesProTaskMapper;
import cn.iocoder.yudao.module.mes.dal.mysql.pro.workorder.MesProWorkOrderMapper;
import cn.iocoder.yudao.module.mes.dal.mysql.dv.machinery.MesDvMachineryMapper;
+import cn.iocoder.yudao.module.mes.dal.mysql.pro.workorder.MesProWorkOrderBomMapper;
+import cn.iocoder.yudao.module.mes.dal.mysql.wm.materialstock.MesWmMaterialStockMapper;
+import cn.iocoder.yudao.module.mes.dal.mysql.wm.warehouse.MesWmWarehouseMapper;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderBomDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.materialstock.MesWmMaterialStockDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseDO;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.module.mes.enums.pro.*;
import cn.iocoder.yudao.module.mes.service.md.workstation.MesMdWorkstationService;
import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
@@ -42,6 +49,9 @@
public class MesProBatchScheduleService {
@Resource private MesProTaskMapper taskMapper;
@Resource private MesProWorkOrderMapper workOrderMapper;
+ @Resource private MesProWorkOrderBomMapper workOrderBomMapper;
+ @Resource private MesWmMaterialStockMapper materialStockMapper;
+ @Resource private MesWmWarehouseMapper warehouseMapper;
@Resource private MesDvMachineryMapper machineryMapper;
@Resource private MesMdWorkstationService workstationService;
@Resource private MesProWorkOrderProcessService workOrderProcessService;
@@ -128,6 +138,34 @@
result.setPreviewTime(now());
var orders = workOrderMapper.selectByIds(request.getWorkOrderIds());
var orderMap = orders.stream().collect(Collectors.toMap(MesProWorkOrderDO::getId, order -> order));
+ var bomByOrder = new HashMap<Long, List<MesProWorkOrderBomDO>>();
+ for (var order : orders) bomByOrder.put(order.getId(), workOrderBomMapper.selectListByWorkOrderId(order.getId()).stream()
+ .sorted(Comparator.comparing(MesProWorkOrderBomDO::getId)).toList());
+ var materialIds = bomByOrder.values().stream().flatMap(Collection::stream).map(MesProWorkOrderBomDO::getItemId)
+ .filter(Objects::nonNull).collect(Collectors.toSet());
+ var warehouses = warehouseMapper.selectList().stream().collect(Collectors.toMap(MesWmWarehouseDO::getId, w -> w));
+ var stocks = materialIds.isEmpty() ? List.<MesWmMaterialStockDO>of() : materialStockMapper.selectList(
+ new LambdaQueryWrapperX<MesWmMaterialStockDO>().in(MesWmMaterialStockDO::getItemId, materialIds));
+ Map<Long, BigDecimal> availableStock = new HashMap<>();
+ for (var stock : stocks) {
+ var warehouse = warehouses.get(stock.getWarehouseId());
+ if (warehouse == null || Boolean.TRUE.equals(warehouse.getFrozen()) || Boolean.TRUE.equals(stock.getFrozen())
+ || MesWmWarehouseDO.WIP_VIRTUAL_WAREHOUSE.equals(warehouse.getCode())) continue;
+ var available = Optional.ofNullable(stock.getQuantity()).orElse(BigDecimal.ZERO)
+ .subtract(Optional.ofNullable(stock.getFrozenQuantity()).orElse(BigDecimal.ZERO))
+ .subtract(Optional.ofNullable(stock.getReservedQuantity()).orElse(BigDecimal.ZERO)).max(BigDecimal.ZERO);
+ availableStock.merge(stock.getItemId(), available, BigDecimal::add);
+ }
+ var materialInfo = materialIds.isEmpty() ? Map.<Long, cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO>of()
+ : itemService.getItemMap(materialIds);
+ for (Long itemId : materialIds) {
+ var item = materialInfo.get(itemId);
+ if (item != null && Boolean.TRUE.equals(item.getSafeStockFlag()) && item.getMinStock() != null) {
+ availableStock.compute(itemId, (key, value) -> Optional.ofNullable(value).orElse(BigDecimal.ZERO)
+ .subtract(item.getMinStock().max(BigDecimal.ZERO)).max(BigDecimal.ZERO));
+ }
+ }
+ var stockSnapshot = new TreeMap<>(availableStock);
var stations = workstationService.getWorkstationListByStatus(0).stream()
.sorted(Comparator.comparing(MesMdWorkstationDO::getId)).toList();
var machineMap = machineryMapper.selectList().stream().collect(Collectors.toMap(MesDvMachineryDO::getId, machine -> machine));
@@ -154,8 +192,7 @@
stationMachines.getOrDefault(task.getWorkstationId(), Set.of()), task.getStartTime(), task.getEndTime()));
}
}
- var sorted = orders.stream().sorted(Comparator.comparing(MesProWorkOrderDO::getRequestDate,
- Comparator.nullsLast(Comparator.naturalOrder())).thenComparing(MesProWorkOrderDO::getId)).toList();
+ var sorted = orders.stream().sorted(MesSchedulePriority.comparator()).toList();
List<Long> orderSequence = new ArrayList<>();
Set<Long> visiting = new HashSet<>();
for (var order : sorted) addChildrenFirst(order.getId(), orderMap, orderSequence, visiting);
@@ -182,6 +219,20 @@
|| (order.getQuantityProduced() != null && order.getQuantityProduced().compareTo(order.getQuantity()) >= 0)) {
throw new IllegalArgumentException("宸ュ崟鏁伴噺鏃犳晥鎴栧凡鐢熶骇瀹屾垚");
}
+ var boms = bomByOrder.getOrDefault(id, List.of());
+ if (boms.isEmpty()) throw new IllegalArgumentException("宸ュ崟娌℃湁 BOM锛屾棤娉曟牳瀵圭墿鏂欓綈濂楋紝璇峰厛缁存姢");
+ BigDecimal unscheduled = order.getQuantity().subtract(Optional.ofNullable(order.getQuantityScheduled()).orElse(BigDecimal.ZERO));
+ if (unscheduled.signum() <= 0) throw new IllegalArgumentException("宸ュ崟宸插畬鎴愭帓浜�");
+ Map<Long, BigDecimal> demand = new HashMap<>();
+ for (var bom : boms) {
+ if (bom.getItemId() == null || bom.getQuantity() == null || bom.getQuantity().signum() <= 0)
+ throw new IllegalArgumentException("宸ュ崟 BOM 鐗╂枡鎴栭渶姹傛暟閲忔棤鏁堬紝璇峰厛缁存姢");
+ var requiredItem = materialInfo.get(bom.getItemId());
+ if (requiredItem == null || !Objects.equals(requiredItem.getStatus(), 0))
+ throw new IllegalArgumentException("宸ュ崟 BOM 瀛樺湪宸插垹闄ゆ垨鍋滅敤鐨勭墿鏂欙紝璇峰厛缁存姢");
+ demand.merge(bom.getItemId(), bom.getQuantity().multiply(unscheduled).divide(order.getQuantity(), 6, RoundingMode.UP), BigDecimal::add);
+ }
+ var trialStock = MesScheduleMaterialCheck.allocate(availableStock, demand);
LocalDateTime earliest = calendar.nextWorkingTime(request.getStartTime());
// 鐖跺伐鍗曞繀椤荤瓑瀛愬伐鍗曪紱鍚屼竴鎵规鎸変緷璧栭『搴忔帓锛屾湭绾冲叆鐨勬湭瀹屾垚瀛愬伐鍗曢樆姝㈡帓浜с��
for (var child : workOrderMapper.selectList(MesProWorkOrderDO::getParentId, id)) {
@@ -300,7 +351,7 @@
}
if (plans.isEmpty()) throw new IllegalArgumentException("鎵�鏈夊伐搴忓凡瀹屾垚鎺掍骇锛屼笉鍙噸澶嶆彁浜�");
if (result.getTasks().size() + plans.size() > 200) throw new IllegalArgumentException("涓�娆℃渶澶氱敓鎴�200涓换鍔★紝璇锋媶鍒嗗伐鍗曟壒娆℃帓浜�");
- result.getTasks().addAll(plans); busy = trialBusy;
+ result.getTasks().addAll(plans); busy = trialBusy; availableStock = trialStock;
orderPlan.setTaskCount(plans.size()); orderPlan.setEndTime(earliest); ends.put(id, earliest);
if (order.getRequestDate() != null && earliest.toLocalDate().isAfter(order.getRequestDate().toLocalDate())) {
orderPlan.setLate(true); result.getWarnings().add("宸ュ崟" + order.getCode() + "棰勮瀹屾垚鏃堕棿鏅氫簬浜ゆ湡");
@@ -316,6 +367,8 @@
fingerprint.put("tasks", result.getTasks()); fingerprint.put("holidays", holidayDates.stream().sorted().toList());
fingerprint.put("workOrders", orders.stream().sorted(Comparator.comparing(MesProWorkOrderDO::getId)).toList());
fingerprint.put("paramTemplates", templateHashes);
+ fingerprint.put("materialStock", stockSnapshot);
+ fingerprint.put("workOrderBoms", new TreeMap<>(bomByOrder));
result.setPreviewHash(DigestUtil.sha256Hex(JsonUtils.toJsonString(fingerprint)));
return result;
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/task/schedule/MesScheduleMaterialCheck.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/task/schedule/MesScheduleMaterialCheck.java
new file mode 100644
index 0000000..311df3c
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/task/schedule/MesScheduleMaterialCheck.java
@@ -0,0 +1,24 @@
+package cn.iocoder.yudao.module.mes.service.pro.task.schedule;
+
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.Map;
+
+/** 鍦ㄤ竴娆℃帓浜ч瑙堝唴鍒嗛厤搴撳瓨蹇収锛岄槻姝㈠涓伐鍗曢噸澶嶄娇鐢ㄥ悓涓�搴撳瓨銆� */
+final class MesScheduleMaterialCheck {
+ private MesScheduleMaterialCheck() {}
+
+ static Map<Long, BigDecimal> allocate(Map<Long, BigDecimal> available, Map<Long, BigDecimal> required) {
+ var remaining = new HashMap<>(available);
+ required.forEach((itemId, quantity) -> {
+ if (itemId == null || quantity == null || quantity.signum() <= 0)
+ throw new IllegalArgumentException("宸ュ崟 BOM 鐗╂枡鎴栭渶姹傛暟閲忔棤鏁�");
+ var stock = remaining.getOrDefault(itemId, BigDecimal.ZERO);
+ if (stock.compareTo(quantity) < 0)
+ throw new IllegalArgumentException("鐗╂枡#" + itemId + "缂烘枡锛氶渶姹� " + quantity.stripTrailingZeros().toPlainString()
+ + "锛屽彲鐢� " + stock.stripTrailingZeros().toPlainString());
+ remaining.put(itemId, stock.subtract(quantity));
+ });
+ return remaining;
+ }
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/task/schedule/MesSchedulePriority.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/task/schedule/MesSchedulePriority.java
new file mode 100644
index 0000000..7924254
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/task/schedule/MesSchedulePriority.java
@@ -0,0 +1,13 @@
+package cn.iocoder.yudao.module.mes.service.pro.task.schedule;
+
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderDO;
+import java.util.Comparator;
+
+final class MesSchedulePriority {
+ private MesSchedulePriority() {}
+ static Comparator<MesProWorkOrderDO> comparator() {
+ return Comparator.comparingInt((MesProWorkOrderDO order) -> order.getSchedulePriority() == null ? 0 : order.getSchedulePriority())
+ .reversed().thenComparing(MesProWorkOrderDO::getRequestDate, Comparator.nullsLast(Comparator.naturalOrder()))
+ .thenComparing(MesProWorkOrderDO::getId);
+ }
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyHazardService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyHazardService.java
index e52c09e..38fe9d9 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyHazardService.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyHazardService.java
@@ -101,8 +101,12 @@
throw exception(SAFETY_HAZARD_ASSIGNEE_REQUIRED);
}
var assignee = refResolver.requireEmployee(reqVO.getAssigneeId(), SAFETY_HAZARD_ASSIGNEE_REQUIRED);
- if (assignee.getUserId() == null) throw exception(SAFETY_HAZARD_ASSIGNEE_NO_ACCOUNT);
- adminUserService.validateUserList(List.of(assignee.getUserId()));
+ Long notifyUserId = assignee.getUserId() != null ? assignee.getUserId() : reqVO.getNotifyUserId();
+ if (notifyUserId == null) throw exception(SAFETY_HAZARD_ASSIGNEE_NO_ACCOUNT);
+ if (assignee.getUserId() != null && reqVO.getNotifyUserId() != null && !assignee.getUserId().equals(reqVO.getNotifyUserId())) {
+ throw cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.invalidParamException("璐d换浜哄凡缁戝畾璐﹀彿锛岄�氱煡鎺ユ敹璐﹀彿蹇呴』涓庡叾涓�鑷�");
+ }
+ adminUserService.validateUserList(List.of(notifyUserId));
SafetyHazardDO update = new SafetyHazardDO();
update.setId(hazard.getId());
update.setAssigneeId(assignee.getId());
@@ -115,7 +119,7 @@
}
hazardMapper.updateById(update);
NotifySendSingleToUserReqDTO notice = new NotifySendSingleToUserReqDTO();
- notice.setUserId(assignee.getUserId());
+ notice.setUserId(notifyUserId);
notice.setTemplateCode("safety_hazard_assigned");
notice.setTemplateParams(Map.of("code", hazard.getCode(), "title", hazard.getTitle(),
"deadline", reqVO.getRectifyDeadline() == null ? "鏈缃�" : reqVO.getRectifyDeadline().toString()));
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyRiskSourceService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyRiskSourceService.java
new file mode 100644
index 0000000..66df97c
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyRiskSourceService.java
@@ -0,0 +1,34 @@
+package cn.iocoder.yudao.module.mes.service.safety;
+import cn.iocoder.yudao.framework.common.pojo.*;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.risk.SafetyRiskSourceSaveReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.safety.SafetyRiskSourceDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.safety.SafetyRiskSourceMapper;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import java.time.LocalDateTime;
+import java.util.Objects;
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.invalidParamException;
+
+@Service public class SafetyRiskSourceService {
+ @Resource private SafetyRiskSourceMapper mapper;
+ public PageResult<SafetyRiskSourceDO> page(PageParam page, String name) {
+ return mapper.selectPage(page, new LambdaQueryWrapperX<SafetyRiskSourceDO>().likeIfPresent(SafetyRiskSourceDO::getName,name).orderByDesc(SafetyRiskSourceDO::getId));
+ }
+ @Transactional(rollbackFor=Exception.class)
+ public Long save(SafetyRiskSourceSaveReqVO req) {
+ SafetyRiskSourceDO old = req.getId()==null ? null : mapper.selectById(req.getId());
+ if (req.getId()!=null && old==null) throw invalidParamException("鍗遍櫓婧愪笉瀛樺湪");
+ String status;
+ try { status=SafetyRiskThreshold.evaluate(req.getCurrentValue(),req.getLowerLimit(),req.getUpperLimit()); }
+ catch (IllegalArgumentException e) { throw invalidParamException(e.getMessage()); }
+ var row=BeanUtils.toBean(req,SafetyRiskSourceDO.class);
+ row.setRiskStatus(status);
+ row.setObservedAt(req.getCurrentValue()==null ? null : old==null || !Objects.equals(old.getCurrentValue(),req.getCurrentValue()) ? LocalDateTime.now() : old.getObservedAt());
+ if (old==null) mapper.insert(row); else mapper.updateById(row);
+ return row.getId();
+ }
+ public void delete(Long id) { if (mapper.selectById(id)==null) throw invalidParamException("鍗遍櫓婧愪笉瀛樺湪"); mapper.deleteById(id); }
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyRiskThreshold.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyRiskThreshold.java
new file mode 100644
index 0000000..b27ccba
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyRiskThreshold.java
@@ -0,0 +1,10 @@
+package cn.iocoder.yudao.module.mes.service.safety;
+import java.math.BigDecimal;
+final class SafetyRiskThreshold {
+ private SafetyRiskThreshold() {}
+ static String evaluate(BigDecimal value, BigDecimal low, BigDecimal high) {
+ if (low != null && high != null && low.compareTo(high) > 0) throw new IllegalArgumentException("涓嬮檺涓嶈兘澶т簬涓婇檺");
+ if (value == null || (low == null && high == null)) return "UNKNOWN";
+ return (low != null && value.compareTo(low) < 0) || (high != null && value.compareTo(high) > 0) ? "ALARM" : "NORMAL";
+ }
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/listener/MesWmItemReceiptStatusListener.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/listener/MesWmItemReceiptStatusListener.java
index c88b0b9..ffdda23 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/listener/MesWmItemReceiptStatusListener.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/listener/MesWmItemReceiptStatusListener.java
@@ -10,6 +10,8 @@
import org.springframework.context.event.EventListener;
import org.springframework.stereotype.Component;
+import java.util.Objects;
+
/**
* 閲囪喘鍏ュ簱鍗� BPM 瀹℃壒鐘舵�佺洃鍚櫒
*
@@ -48,6 +50,11 @@
return;
}
+ // 涓嶅悓涓氬姟鐨勬祦绋嬪彲鑳戒娇鐢ㄧ浉鍚岀殑鏁板瓧涓氬姟涓婚敭锛屽彧澶勭悊璇ュ叆搴撳崟缁戝畾鐨勬祦绋嬪疄渚嬨��
+ if (event.getId() == null || !Objects.equals(receipt.getProcessInstanceId(), event.getId())) {
+ return;
+ }
+
// 3. 鏍¢獙鍏ュ簱鍗曠姸鎬佷负瀹℃壒涓�
if (!MesWmItemReceiptStatusEnum.APPROVING.getStatus().equals(receipt.getStatus())) {
log.warn("[onApplicationEvent] 鍏ュ簱鍗�({}) 涓嶅浜庡鎵逛腑鐘舵�侊紝褰撳墠鐘舵�侊細{}", receiptId, receipt.getStatus());
diff --git a/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/api/returnsales/AfterSaleReturnSourceTest.java b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/api/returnsales/AfterSaleReturnSourceTest.java
new file mode 100644
index 0000000..2f0aa1c
--- /dev/null
+++ b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/api/returnsales/AfterSaleReturnSourceTest.java
@@ -0,0 +1,19 @@
+package cn.iocoder.yudao.module.mes.api.returnsales;
+
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.mes.api.returnsales.dto.MesWmReturnSalesCreateReqDTO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.returnsales.vo.MesWmReturnSalesSaveReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnsales.MesWmReturnSalesDO;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+class AfterSaleReturnSourceTest {
+ @Test
+ void sourceReturnIdSurvivesBothConversions() {
+ var request = new MesWmReturnSalesCreateReqDTO();
+ request.setAfterSaleReturnId(73L);
+ var save = BeanUtils.toBean(request, MesWmReturnSalesSaveReqVO.class);
+ var entity = BeanUtils.toBean(save, MesWmReturnSalesDO.class);
+ assertEquals(73L, entity.getAfterSaleReturnId());
+ }
+}
diff --git a/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/collect/CollectOfflinePolicyTest.java b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/collect/CollectOfflinePolicyTest.java
new file mode 100644
index 0000000..e3c80bc
--- /dev/null
+++ b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/collect/CollectOfflinePolicyTest.java
@@ -0,0 +1,36 @@
+package cn.iocoder.yudao.module.mes.service.collect;
+
+import org.junit.jupiter.api.Test;
+import java.time.Duration;
+import java.time.LocalDateTime;
+import static org.junit.jupiter.api.Assertions.*;
+import java.util.List;
+
+class CollectOfflinePolicyTest {
+ private final LocalDateTime t = LocalDateTime.of(2026, 11, 6, 8, 0);
+ private final Duration timeout = Duration.ofMinutes(5);
+
+ @Test void recordsOnlyGapsAfterLastObservedSampleAndClipsAtQueryBounds() {
+ var intervals = CollectOfflinePolicy.calculate(List.of(t, t.plusMinutes(2), t.plusMinutes(12)),
+ t.plusMinutes(5), t.plusMinutes(20), timeout);
+ assertEquals(2, intervals.size());
+ assertEquals(t.plusMinutes(7), intervals.get(0).start());
+ assertEquals(t.plusMinutes(12), intervals.get(0).end());
+ assertEquals(t.plusMinutes(17), intervals.get(1).start());
+ assertEquals(t.plusMinutes(20), intervals.get(1).end());
+ assertTrue(CollectOfflinePolicy.calculate(List.of(), t, t.plusHours(1), timeout).isEmpty());
+ }
+
+ @Test void doesNotInferBeforeFirstSampleOrCountShortGaps() {
+ var result = CollectOfflinePolicy.calculate(List.of(t.plusMinutes(5), t.plusMinutes(9)),
+ t, t.plusMinutes(12), timeout);
+ assertTrue(result.isEmpty());
+ }
+
+ @Test void openOfflineIntervalIsClippedToTheRequestedWindow() {
+ var result = CollectOfflinePolicy.calculate(List.of(t), t.plusMinutes(10), t.plusMinutes(20), timeout);
+ assertEquals(1, result.size());
+ assertEquals(t.plusMinutes(10), result.getFirst().start());
+ assertEquals(t.plusMinutes(20), result.getFirst().end());
+ }
+}
diff --git a/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/pd/knowledge/KnowledgeMatchTest.java b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/pd/knowledge/KnowledgeMatchTest.java
new file mode 100644
index 0000000..ce011f0
--- /dev/null
+++ b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/pd/knowledge/KnowledgeMatchTest.java
@@ -0,0 +1,37 @@
+package cn.iocoder.yudao.module.mes.service.pd.knowledge;
+
+import org.junit.jupiter.api.Test;
+import java.math.BigDecimal;
+import java.util.Set;
+import static org.junit.jupiter.api.Assertions.*;
+
+class KnowledgeMatchTest {
+ @Test
+ void matchesOnlyWhenAllSpecifiedConditionsAreSatisfied() {
+ var knowledge = new KnowledgeMatch.Criteria(10L, 20L, new BigDecimal("10"),
+ new BigDecimal("35"), "EXPORT", Set.of("IEC-1", "IEC-2"));
+ assertTrue(KnowledgeMatch.matches(knowledge, new KnowledgeMatch.Request(10L, 20L,
+ new BigDecimal("10"), "EXPORT", Set.of("IEC-1", "IEC-2"))));
+ assertFalse(KnowledgeMatch.matches(knowledge, new KnowledgeMatch.Request(10L, 20L,
+ new BigDecimal("36"), "EXPORT", Set.of("IEC-1", "IEC-2"))));
+ assertFalse(KnowledgeMatch.matches(knowledge, new KnowledgeMatch.Request(10L, 20L,
+ new BigDecimal("20"), "DOMESTIC", Set.of("IEC-1", "IEC-2"))));
+ assertFalse(KnowledgeMatch.matches(knowledge, new KnowledgeMatch.Request(10L, 20L,
+ new BigDecimal("20"), "EXPORT", Set.of("IEC-1", "IEC-3"))));
+ assertFalse(KnowledgeMatch.matches(knowledge, new KnowledgeMatch.Request(10L, null,
+ new BigDecimal("20"), "EXPORT", Set.of("IEC-1", "IEC-2"))));
+ assertFalse(KnowledgeMatch.matches(knowledge, new KnowledgeMatch.Request(11L, 20L,
+ new BigDecimal("20"), "EXPORT", Set.of("IEC-1", "IEC-2"))));
+ }
+
+ @Test
+ void unrestrictedKnowledgeMatchesWithoutInventingUnknownRequestValues() {
+ var knowledge = new KnowledgeMatch.Criteria(null, null, null, null, "ALL", Set.of());
+ assertTrue(KnowledgeMatch.matches(knowledge, new KnowledgeMatch.Request(null, null,
+ null, null, Set.of())));
+ var voltageRestricted = new KnowledgeMatch.Criteria(null, null, BigDecimal.ONE,
+ null, "ALL", Set.of());
+ assertFalse(KnowledgeMatch.matches(voltageRestricted, new KnowledgeMatch.Request(null,
+ null, null, null, Set.of())));
+ }
+}
diff --git a/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/pd/knowledge/KnowledgeSearchServiceTest.java b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/pd/knowledge/KnowledgeSearchServiceTest.java
new file mode 100644
index 0000000..eec980c
--- /dev/null
+++ b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/pd/knowledge/KnowledgeSearchServiceTest.java
@@ -0,0 +1,86 @@
+package cn.iocoder.yudao.module.mes.service.pd.knowledge;
+
+import cn.iocoder.yudao.module.mes.dal.dataobject.pd.knowledge.KnowledgeDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pd.knowledge.KnowledgeStandardDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.pd.knowledge.KnowledgeMapper;
+import cn.iocoder.yudao.module.mes.dal.mysql.pd.knowledge.KnowledgeStandardMapper;
+import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdProductBomDO;
+import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
+import cn.iocoder.yudao.module.mes.service.md.item.MesMdProductBomService;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import org.junit.jupiter.api.Test;
+import org.springframework.test.util.ReflectionTestUtils;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Set;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.*;
+
+class KnowledgeSearchServiceTest {
+ @Test
+ void missingBomReferenceIsNotRecommended() {
+ var knowledgeMapper = mock(KnowledgeMapper.class);
+ var standardMapper = mock(KnowledgeStandardMapper.class);
+ var knowledge = new KnowledgeDO(); knowledge.setId(1L); knowledge.setBomId(501L); knowledge.setMarket("ALL");
+ when(knowledgeMapper.selectList(any(Wrapper.class))).thenReturn(List.of(knowledge));
+ when(standardMapper.selectList(any(Wrapper.class))).thenReturn(List.of());
+ var service = new KnowledgeSearchService();
+ ReflectionTestUtils.setField(service, "knowledgeMapper", knowledgeMapper);
+ ReflectionTestUtils.setField(service, "standardMapper", standardMapper);
+ assertEquals(List.of(), service.match(new KnowledgeMatch.Request(null, null, null, null, Set.of())));
+ }
+
+ @Test
+ void productBomMatchesByComponentRatherThanBomLineId() {
+ var knowledgeMapper = mock(KnowledgeMapper.class);
+ var standardMapper = mock(KnowledgeStandardMapper.class);
+ var itemService = mock(MesMdItemService.class);
+ var bomService = mock(MesMdProductBomService.class);
+ var knowledge = new KnowledgeDO(); knowledge.setId(1L); knowledge.setProductItemId(42L);
+ knowledge.setBomId(70L); knowledge.setMarket("ALL");
+ var candidate = new MesMdProductBomDO().setId(502L).setItemId(42L).setBomItemId(70L).setStatus(0);
+ when(knowledgeMapper.selectList(any(Wrapper.class))).thenReturn(List.of(knowledge));
+ when(standardMapper.selectList(any(Wrapper.class))).thenReturn(List.of());
+ when(bomService.getProductBomListByItemId(42L)).thenReturn(List.of(candidate));
+ var service = new KnowledgeSearchService();
+ ReflectionTestUtils.setField(service, "knowledgeMapper", knowledgeMapper);
+ ReflectionTestUtils.setField(service, "standardMapper", standardMapper);
+ ReflectionTestUtils.setField(service, "itemService", itemService);
+ ReflectionTestUtils.setField(service, "bomService", bomService);
+ assertEquals(List.of(1L), service.match(new KnowledgeMatch.Request(42L, null, null, null, Set.of()))
+ .stream().map(KnowledgeDO::getId).toList());
+ org.junit.jupiter.api.Assertions.assertThrows(RuntimeException.class,
+ () -> service.match(new KnowledgeMatch.Request(42L, 71L, null, null, Set.of())));
+ candidate.setBomItemId(71L);
+ assertEquals(List.of(), service.match(new KnowledgeMatch.Request(42L, null, null, null, Set.of())));
+ }
+
+ @Test
+ void joinsStandardsToTheRightKnowledgeRecord() {
+ var knowledgeMapper = mock(KnowledgeMapper.class);
+ var standardMapper = mock(KnowledgeStandardMapper.class);
+ var first = new KnowledgeDO(); first.setId(1L); first.setMarket("ALL");
+ var second = new KnowledgeDO(); second.setId(2L); second.setMarket("ALL");
+ var standard = new KnowledgeStandardDO(); standard.setKnowledgeId(2L); standard.setStandardCode("IEC-1");
+ when(knowledgeMapper.selectList(any(Wrapper.class))).thenReturn(List.of(first, second));
+ when(standardMapper.selectList(any(Wrapper.class))).thenReturn(List.of(standard));
+ var service = new KnowledgeSearchService();
+ ReflectionTestUtils.setField(service, "knowledgeMapper", knowledgeMapper);
+ ReflectionTestUtils.setField(service, "standardMapper", standardMapper);
+ var result = service.match(new KnowledgeMatch.Request(null, null, BigDecimal.ONE, null, Set.of("IEC-1")));
+ assertEquals(List.of(2L), result.stream().map(KnowledgeDO::getId).toList());
+ }
+
+ @Test
+ void noKnowledgeDoesNotQueryStandards() {
+ var knowledgeMapper = mock(KnowledgeMapper.class);
+ var standardMapper = mock(KnowledgeStandardMapper.class);
+ when(knowledgeMapper.selectList(any(Wrapper.class))).thenReturn(List.of());
+ var service = new KnowledgeSearchService();
+ ReflectionTestUtils.setField(service, "knowledgeMapper", knowledgeMapper);
+ ReflectionTestUtils.setField(service, "standardMapper", standardMapper);
+ assertEquals(List.of(), service.match(new KnowledgeMatch.Request(null, null, null, null, Set.of())));
+ verifyNoInteractions(standardMapper);
+ }
+}
diff --git a/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/pd/knowledge/KnowledgeWriteServiceTest.java b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/pd/knowledge/KnowledgeWriteServiceTest.java
new file mode 100644
index 0000000..8b1c671
--- /dev/null
+++ b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/pd/knowledge/KnowledgeWriteServiceTest.java
@@ -0,0 +1,90 @@
+package cn.iocoder.yudao.module.mes.service.pd.knowledge;
+
+import cn.iocoder.yudao.module.mes.dal.dataobject.pd.knowledge.KnowledgeDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.pd.knowledge.KnowledgeMapper;
+import cn.iocoder.yudao.module.mes.dal.mysql.pd.knowledge.KnowledgeStandardMapper;
+import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdProductBomDO;
+import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
+import cn.iocoder.yudao.module.mes.service.md.item.MesMdProductBomService;
+import org.junit.jupiter.api.Test;
+import org.springframework.test.util.ReflectionTestUtils;
+import java.util.List;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.Mockito.*;
+
+class KnowledgeWriteServiceTest {
+ @Test
+ void bomMustBelongToSelectedProduct() {
+ var mapper = mock(KnowledgeMapper.class);
+ var items = mock(MesMdItemService.class);
+ var boms = mock(MesMdProductBomService.class);
+ when(boms.getProductBomListByItemId(42L)).thenReturn(java.util.List.of(new MesMdProductBomDO().setId(8L).setItemId(99L).setBomItemId(7L).setStatus(0)));
+ var service = new KnowledgeWriteService();
+ ReflectionTestUtils.setField(service, "knowledgeMapper", mapper);
+ ReflectionTestUtils.setField(service, "itemService", items);
+ ReflectionTestUtils.setField(service, "bomService", boms);
+ var input = new KnowledgeWriteService.SaveRequest(); input.setCode("KN-BOM"); input.setName("娴嬭瘯");
+ input.setMarket("ALL"); input.setProductItemId(42L); input.setBomId(7L);
+ assertThrows(RuntimeException.class, () -> service.create(input));
+ verifyNoInteractions(mapper);
+ }
+
+ @Test
+ void referenceRequiresBothKnowledgeAndRoute() {
+ var mapper = mock(KnowledgeMapper.class);
+ var service = new KnowledgeWriteService();
+ ReflectionTestUtils.setField(service, "knowledgeMapper", mapper);
+ assertThrows(RuntimeException.class, () -> service.referenceRoute(1L, null));
+ verifyNoInteractions(mapper);
+ }
+
+ @Test
+ void emptyResourceCapabilityIsRejectedBeforeWriting() {
+ var mapper = mock(KnowledgeMapper.class);
+ var service = new KnowledgeWriteService();
+ ReflectionTestUtils.setField(service, "knowledgeMapper", mapper);
+ var input = new KnowledgeWriteService.SaveRequest();
+ input.setCode("KN-2"); input.setName("娴嬭瘯鐭ヨ瘑"); input.setMarket("ALL");
+ var resource = new KnowledgeWriteService.ResourceInput(); resource.setResourceType("OTHER");
+ resource.setCapabilityDescription(" "); input.setResources(List.of(resource));
+ assertThrows(RuntimeException.class, () -> service.create(input));
+ verifyNoInteractions(mapper);
+ }
+
+ @Test
+ void revisionRequiresPublishedSource() {
+ var mapper = mock(KnowledgeMapper.class);
+ var draft = new KnowledgeDO(); draft.setId(7L); draft.setStatus(0);
+ when(mapper.selectById(7L)).thenReturn(draft);
+ var service = new KnowledgeWriteService();
+ ReflectionTestUtils.setField(service, "knowledgeMapper", mapper);
+ assertThrows(RuntimeException.class, () -> service.revise(7L));
+ verify(mapper, never()).insert(any(KnowledgeDO.class));
+ }
+
+ @Test
+ void invalidMarketIsRejectedBeforeWriting() {
+ var mapper = mock(KnowledgeMapper.class);
+ var service = new KnowledgeWriteService();
+ ReflectionTestUtils.setField(service, "knowledgeMapper", mapper);
+ var input = new KnowledgeWriteService.SaveRequest();
+ input.setCode("KN-1"); input.setName("娴嬭瘯鐭ヨ瘑");
+ assertThrows(RuntimeException.class, () -> service.create(input));
+ verifyNoInteractions(mapper);
+ }
+
+ @Test
+ void publishedVersionCannotBeEdited() {
+ var mapper = mock(KnowledgeMapper.class);
+ var standards = mock(KnowledgeStandardMapper.class);
+ var existing = new KnowledgeDO(); existing.setId(9L); existing.setStatus(1);
+ when(mapper.selectById(9L)).thenReturn(existing);
+ var service = new KnowledgeWriteService();
+ ReflectionTestUtils.setField(service, "knowledgeMapper", mapper);
+ ReflectionTestUtils.setField(service, "standardMapper", standards);
+ var input = new KnowledgeWriteService.SaveRequest();
+ input.setId(9L);
+ assertThrows(RuntimeException.class, () -> service.update(input));
+ verifyNoInteractions(standards);
+ }
+}
diff --git a/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/pro/task/schedule/MesScheduleMaterialCheckTest.java b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/pro/task/schedule/MesScheduleMaterialCheckTest.java
new file mode 100644
index 0000000..15547e3
--- /dev/null
+++ b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/pro/task/schedule/MesScheduleMaterialCheckTest.java
@@ -0,0 +1,23 @@
+package cn.iocoder.yudao.module.mes.service.pro.task.schedule;
+
+import org.junit.jupiter.api.Test;
+import java.math.BigDecimal;
+import java.util.Map;
+import static org.junit.jupiter.api.Assertions.*;
+
+class MesScheduleMaterialCheckTest {
+ @Test void oneBatchCannotUseSameStockTwice() {
+ var stock = Map.of(1L, new BigDecimal("10"));
+ var first = MesScheduleMaterialCheck.allocate(stock, Map.of(1L, new BigDecimal("6")));
+ assertEquals(0, first.get(1L).compareTo(new BigDecimal("4")));
+ assertThrows(IllegalArgumentException.class, () -> MesScheduleMaterialCheck.allocate(first, Map.of(1L, new BigDecimal("5"))));
+ assertEquals(0, stock.get(1L).compareTo(new BigDecimal("10")));
+ }
+ @Test void shortageOrInvalidRequirementIsRejected() {
+ assertThrows(IllegalArgumentException.class, () -> MesScheduleMaterialCheck.allocate(Map.of(), Map.of(2L, BigDecimal.ONE)));
+ assertThrows(IllegalArgumentException.class, () -> MesScheduleMaterialCheck.allocate(Map.of(2L, BigDecimal.TEN), Map.of(2L, BigDecimal.ZERO)));
+ }
+ @Test void sufficientStockCanBeAllocated() {
+ assertEquals(0, MesScheduleMaterialCheck.allocate(Map.of(2L, BigDecimal.TEN), Map.of(2L, BigDecimal.TEN)).get(2L).signum());
+ }
+}
diff --git a/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/pro/task/schedule/MesSchedulePriorityTest.java b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/pro/task/schedule/MesSchedulePriorityTest.java
new file mode 100644
index 0000000..92a1555
--- /dev/null
+++ b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/pro/task/schedule/MesSchedulePriorityTest.java
@@ -0,0 +1,15 @@
+package cn.iocoder.yudao.module.mes.service.pro.task.schedule;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderDO;
+import org.junit.jupiter.api.Test;
+import java.time.LocalDateTime;
+import java.util.List;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+class MesSchedulePriorityTest {
+ @Test void higherPriorityFirstThenEarlierDeliveryThenId() {
+ var low = new MesProWorkOrderDO().setId(1L).setSchedulePriority(0).setRequestDate(LocalDateTime.of(2026,1,1,0,0));
+ var high = new MesProWorkOrderDO().setId(2L).setSchedulePriority(9).setRequestDate(LocalDateTime.of(2026,2,1,0,0));
+ var older = new MesProWorkOrderDO().setId(3L).setSchedulePriority(9).setRequestDate(LocalDateTime.of(2026,1,2,0,0));
+ assertEquals(List.of(3L,2L,1L), List.of(low,high,older).stream().sorted(MesSchedulePriority.comparator()).map(MesProWorkOrderDO::getId).toList());
+ }
+}
diff --git a/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/safety/SafetyDocumentPolicyTest.java b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/safety/SafetyDocumentPolicyTest.java
new file mode 100644
index 0000000..b97f924
--- /dev/null
+++ b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/safety/SafetyDocumentPolicyTest.java
@@ -0,0 +1,12 @@
+package cn.iocoder.yudao.module.mes.service.safety;
+
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.*;
+
+class SafetyDocumentPolicyTest {
+ @Test void onlyPendingDocumentsCanBeApprovedAndTheSubmitterCannotApprove() {
+ assertThrows(RuntimeException.class, () -> SafetyDocumentPolicy.checkApproval("DRAFT", 1L, 2L));
+ assertThrows(RuntimeException.class, () -> SafetyDocumentPolicy.checkApproval("PENDING", 1L, 1L));
+ assertDoesNotThrow(() -> SafetyDocumentPolicy.checkApproval("PENDING", 1L, 2L));
+ }
+}
diff --git a/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/safety/SafetyHazardNoticeTest.java b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/safety/SafetyHazardNoticeTest.java
new file mode 100644
index 0000000..5df3a04
--- /dev/null
+++ b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/safety/SafetyHazardNoticeTest.java
@@ -0,0 +1,100 @@
+package cn.iocoder.yudao.module.mes.service.safety;
+
+import cn.iocoder.yudao.module.hrm.api.employee.dto.HrmEmployeeSimpleDTO;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.hazard.SafetyHazardAssignReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.safety.SafetyHazardDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.safety.SafetyHazardMapper;
+import cn.iocoder.yudao.module.system.api.notify.NotifyMessageSendApi;
+import org.junit.jupiter.api.Test;
+import org.springframework.test.util.ReflectionTestUtils;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.ArgumentMatchers.*;
+import static org.mockito.Mockito.*;
+import org.mockito.ArgumentCaptor;
+import cn.iocoder.yudao.module.system.api.notify.dto.NotifySendSingleToUserReqDTO;
+import cn.iocoder.yudao.module.system.service.user.AdminUserService;
+import java.util.List;
+
+class SafetyHazardNoticeTest {
+ @Test void unlinkedEmployeeCanUseExplicitNotificationAccount() {
+ var service = new SafetyHazardService();
+ var mapper = mock(SafetyHazardMapper.class);
+ var resolver = mock(SafetyRefResolver.class);
+ var notify = mock(NotifyMessageSendApi.class);
+ var users = mock(AdminUserService.class);
+ ReflectionTestUtils.setField(service, "hazardMapper", mapper);
+ ReflectionTestUtils.setField(service, "refResolver", resolver);
+ ReflectionTestUtils.setField(service, "notifyMessageSendApi", notify);
+ ReflectionTestUtils.setField(service, "adminUserService", users);
+ var hazard = new SafetyHazardDO(); hazard.setId(1L); hazard.setStatus("REPORTED"); hazard.setCode("HZ1"); hazard.setTitle("娴嬭瘯闅愭偅");
+ when(mapper.selectByIdForUpdate(1L)).thenReturn(hazard);
+ var employee = new HrmEmployeeSimpleDTO(); employee.setId(2L); employee.setName("璐d换浜�");
+ when(resolver.requireEmployee(eq(2L), any())).thenReturn(employee);
+ when(notify.sendSingleMessageToAdmin(any())).thenReturn(9L);
+ var req = new SafetyHazardAssignReqVO(); req.setId(1L); req.setAssigneeId(2L); req.setNotifyUserId(3L);
+ service.assignHazard(req);
+ var captor = ArgumentCaptor.forClass(NotifySendSingleToUserReqDTO.class);
+ verify(notify).sendSingleMessageToAdmin(captor.capture());
+ org.junit.jupiter.api.Assertions.assertEquals(3L, captor.getValue().getUserId());
+ verify(users).validateUserList(List.of(3L));
+ }
+ @Test
+ void disabledTemplateFailsAssignment() {
+ var service = new SafetyHazardService();
+ var mapper = mock(SafetyHazardMapper.class);
+ var resolver = mock(SafetyRefResolver.class);
+ var notify = mock(NotifyMessageSendApi.class);
+ ReflectionTestUtils.setField(service, "hazardMapper", mapper);
+ ReflectionTestUtils.setField(service, "refResolver", resolver);
+ ReflectionTestUtils.setField(service, "notifyMessageSendApi", notify);
+ ReflectionTestUtils.setField(service, "adminUserService", mock(AdminUserService.class));
+ var hazard = new SafetyHazardDO(); hazard.setId(1L); hazard.setStatus("REPORTED"); hazard.setCode("HZ1"); hazard.setTitle("娴嬭瘯闅愭偅");
+ when(mapper.selectByIdForUpdate(1L)).thenReturn(hazard);
+ var employee = new HrmEmployeeSimpleDTO(); employee.setId(2L); employee.setUserId(3L); employee.setName("璐d换浜�");
+ when(resolver.requireEmployee(eq(2L), any())).thenReturn(employee);
+ when(notify.sendSingleMessageToAdmin(any())).thenReturn(null);
+ var req = new SafetyHazardAssignReqVO(); req.setId(1L); req.setAssigneeId(2L);
+ assertThrows(RuntimeException.class, () -> service.assignHazard(req));
+ }
+ @Test
+ void assignmentSendsNoticeToLinkedAccount() {
+ var service = new SafetyHazardService();
+ var mapper = mock(SafetyHazardMapper.class);
+ var resolver = mock(SafetyRefResolver.class);
+ var notify = mock(NotifyMessageSendApi.class);
+ ReflectionTestUtils.setField(service, "hazardMapper", mapper);
+ ReflectionTestUtils.setField(service, "refResolver", resolver);
+ ReflectionTestUtils.setField(service, "notifyMessageSendApi", notify);
+ ReflectionTestUtils.setField(service, "adminUserService", mock(AdminUserService.class));
+ var hazard = new SafetyHazardDO(); hazard.setId(1L); hazard.setStatus("REPORTED"); hazard.setCode("HZ1"); hazard.setTitle("娴嬭瘯闅愭偅");
+ when(mapper.selectByIdForUpdate(1L)).thenReturn(hazard);
+ var employee = new HrmEmployeeSimpleDTO(); employee.setId(2L); employee.setUserId(3L); employee.setName("璐d换浜�");
+ when(resolver.requireEmployee(eq(2L), any())).thenReturn(employee);
+ when(notify.sendSingleMessageToAdmin(any())).thenReturn(9L);
+ when(mapper.updateById(any(SafetyHazardDO.class))).thenReturn(1);
+ var req = new SafetyHazardAssignReqVO(); req.setId(1L); req.setAssigneeId(2L);
+ service.assignHazard(req);
+ var sent = ArgumentCaptor.forClass(NotifySendSingleToUserReqDTO.class);
+ verify(notify).sendSingleMessageToAdmin(sent.capture());
+ org.junit.jupiter.api.Assertions.assertEquals(3L, sent.getValue().getUserId());
+ org.junit.jupiter.api.Assertions.assertEquals("HZ1", sent.getValue().getTemplateParams().get("code"));
+ }
+ @Test
+ void rejectAssignmentWhenResponsibleEmployeeHasNoAccount() {
+ var service = new SafetyHazardService();
+ var mapper = mock(SafetyHazardMapper.class);
+ var resolver = mock(SafetyRefResolver.class);
+ var notify = mock(NotifyMessageSendApi.class);
+ ReflectionTestUtils.setField(service, "hazardMapper", mapper);
+ ReflectionTestUtils.setField(service, "refResolver", resolver);
+ ReflectionTestUtils.setField(service, "notifyMessageSendApi", notify);
+ var hazard = new SafetyHazardDO(); hazard.setId(1L); hazard.setStatus("REPORTED");
+ when(mapper.selectByIdForUpdate(1L)).thenReturn(hazard);
+ var employee = new HrmEmployeeSimpleDTO(); employee.setId(2L); employee.setName("璐d换浜�");
+ when(resolver.requireEmployee(eq(2L), any())).thenReturn(employee);
+ var req = new SafetyHazardAssignReqVO(); req.setId(1L); req.setAssigneeId(2L);
+ assertThrows(RuntimeException.class, () -> service.assignHazard(req));
+ verify(notify, never()).sendSingleMessageToAdmin(any());
+ verify(mapper, never()).updateById(any(SafetyHazardDO.class));
+ }
+}
diff --git a/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/safety/SafetyRiskSourceServiceTest.java b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/safety/SafetyRiskSourceServiceTest.java
new file mode 100644
index 0000000..1faf38d
--- /dev/null
+++ b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/safety/SafetyRiskSourceServiceTest.java
@@ -0,0 +1,28 @@
+package cn.iocoder.yudao.module.mes.service.safety;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.risk.SafetyRiskSourceSaveReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.safety.SafetyRiskSourceDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.safety.SafetyRiskSourceMapper;
+import org.junit.jupiter.api.Test;
+import org.mockito.ArgumentCaptor;
+import org.springframework.test.util.ReflectionTestUtils;
+import java.math.BigDecimal;
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.Mockito.*;
+
+class SafetyRiskSourceServiceTest {
+ @Test void savingAboveLimitCreatesAlarmWithObservationTime() {
+ var service=new SafetyRiskSourceService();var mapper=mock(SafetyRiskSourceMapper.class);
+ ReflectionTestUtils.setField(service,"mapper",mapper);
+ var req=new SafetyRiskSourceSaveReqVO();req.setName("娴嬭瘯鍗遍櫓婧�");req.setCategory("MAJOR");req.setMetricName("娓╁害");
+ req.setUpperLimit(BigDecimal.TEN);req.setCurrentValue(new BigDecimal("11"));
+ service.save(req);
+ var captor=ArgumentCaptor.forClass(SafetyRiskSourceDO.class);verify(mapper).insert(captor.capture());
+ assertEquals("ALARM",captor.getValue().getRiskStatus());assertNotNull(captor.getValue().getObservedAt());
+ }
+ @Test void invalidRangeDoesNotInsert() {
+ var service=new SafetyRiskSourceService();var mapper=mock(SafetyRiskSourceMapper.class);
+ ReflectionTestUtils.setField(service,"mapper",mapper);
+ var req=new SafetyRiskSourceSaveReqVO();req.setLowerLimit(BigDecimal.TEN);req.setUpperLimit(BigDecimal.ONE);
+ assertThrows(RuntimeException.class,()->service.save(req));verify(mapper,never()).insert(any(SafetyRiskSourceDO.class));
+ }
+}
diff --git a/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/safety/SafetyRiskThresholdTest.java b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/safety/SafetyRiskThresholdTest.java
new file mode 100644
index 0000000..314dd93
--- /dev/null
+++ b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/safety/SafetyRiskThresholdTest.java
@@ -0,0 +1,18 @@
+package cn.iocoder.yudao.module.mes.service.safety;
+import org.junit.jupiter.api.Test;
+import java.math.BigDecimal;
+import static org.junit.jupiter.api.Assertions.*;
+class SafetyRiskThresholdTest {
+ @Test void normalAndOutOfRange() {
+ assertEquals("NORMAL", SafetyRiskThreshold.evaluate(new BigDecimal("5"), BigDecimal.ZERO, BigDecimal.TEN));
+ assertEquals("ALARM", SafetyRiskThreshold.evaluate(new BigDecimal("11"), BigDecimal.ZERO, BigDecimal.TEN));
+ assertEquals("ALARM", SafetyRiskThreshold.evaluate(new BigDecimal("-1"), BigDecimal.ZERO, BigDecimal.TEN));
+ }
+ @Test void noDataOrNoLimitIsUnknown() {
+ assertEquals("UNKNOWN", SafetyRiskThreshold.evaluate(null, BigDecimal.ZERO, BigDecimal.TEN));
+ assertEquals("UNKNOWN", SafetyRiskThreshold.evaluate(BigDecimal.ONE, null, null));
+ }
+ @Test void reversedLimitsAreRejected() {
+ assertThrows(IllegalArgumentException.class, () -> SafetyRiskThreshold.evaluate(BigDecimal.ONE, BigDecimal.TEN, BigDecimal.ZERO));
+ }
+}
diff --git a/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptStatusListenerTest.java b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptStatusListenerTest.java
new file mode 100644
index 0000000..3655b1d
--- /dev/null
+++ b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptStatusListenerTest.java
@@ -0,0 +1,35 @@
+package cn.iocoder.yudao.module.mes.service.wm.itemreceipt;
+
+import cn.iocoder.yudao.module.bpm.api.event.BpmProcessInstanceStatusEvent;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.itemreceipt.MesWmItemReceiptDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.wm.itemreceipt.MesWmItemReceiptMapper;
+import cn.iocoder.yudao.module.mes.enums.wm.MesWmItemReceiptStatusEnum;
+import cn.iocoder.yudao.module.mes.service.wm.itemreceipt.listener.MesWmItemReceiptStatusListener;
+import org.junit.jupiter.api.Test;
+import org.springframework.test.util.ReflectionTestUtils;
+import static org.mockito.Mockito.*;
+
+class MesWmItemReceiptStatusListenerTest {
+ @Test void ignoresAnotherProcessWithSameBusinessKey() {
+ var listener = new MesWmItemReceiptStatusListener();
+ var mapper = mock(MesWmItemReceiptMapper.class);
+ var service = mock(MesWmItemReceiptService.class);
+ ReflectionTestUtils.setField(listener, "itemReceiptMapper", mapper);
+ ReflectionTestUtils.setField(listener, "itemReceiptService", service);
+ var receipt = new MesWmItemReceiptDO().setId(12L).setProcessInstanceId("receipt-process").setStatus(MesWmItemReceiptStatusEnum.APPROVING.getStatus());
+ when(mapper.selectById(12L)).thenReturn(receipt);
+ var event = new BpmProcessInstanceStatusEvent(this).setBusinessKey("12").setId("unrelated-process").setStatus(2);
+ listener.onApplicationEvent(event);
+ verifyNoInteractions(service);
+ }
+ @Test void updatesMatchingProcess() {
+ var listener = new MesWmItemReceiptStatusListener();
+ var mapper = mock(MesWmItemReceiptMapper.class);
+ var service = mock(MesWmItemReceiptService.class);
+ ReflectionTestUtils.setField(listener, "itemReceiptMapper", mapper);
+ ReflectionTestUtils.setField(listener, "itemReceiptService", service);
+ when(mapper.selectById(12L)).thenReturn(new MesWmItemReceiptDO().setId(12L).setProcessInstanceId("receipt-process").setStatus(MesWmItemReceiptStatusEnum.APPROVING.getStatus()));
+ listener.onApplicationEvent(new BpmProcessInstanceStatusEvent(this).setBusinessKey("12").setId("receipt-process").setStatus(2));
+ verify(service).updateItemReceiptAuditStatus(12L, 2);
+ }
+}
diff --git a/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesReturnInboundAfterSaleTest.java b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesReturnInboundAfterSaleTest.java
new file mode 100644
index 0000000..5d29147
--- /dev/null
+++ b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesReturnInboundAfterSaleTest.java
@@ -0,0 +1,63 @@
+package cn.iocoder.yudao.module.mes.service.wm.returnsales;
+
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.module.aftersales.api.AfterSaleTicketApi;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnsales.MesWmReturnSalesDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnsales.MesWmReturnSalesLineDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnsales.MesWmReturnSalesDetailDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.wm.returnsales.MesWmReturnSalesMapper;
+import cn.iocoder.yudao.module.mes.enums.wm.MesWmReturnSalesStatusEnum;
+import cn.iocoder.yudao.module.mes.service.wm.transaction.MesWmTransactionService;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.ObjectProvider;
+import org.springframework.test.util.ReflectionTestUtils;
+import java.util.List;
+import java.math.BigDecimal;
+import static org.mockito.Mockito.*;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+class MesReturnInboundAfterSaleTest {
+ @Test
+ void stockCompletionFailsIfLinkedAfterSaleServiceIsUnavailable() {
+ var mapper = mock(MesWmReturnSalesMapper.class);
+ var lines = mock(MesWmReturnSalesLineService.class);
+ var details = mock(MesWmReturnSalesDetailService.class);
+ @SuppressWarnings("unchecked") ObjectProvider<AfterSaleTicketApi> provider = mock(ObjectProvider.class);
+ var doc = new MesWmReturnSalesDO().setId(42L).setStatus(MesWmReturnSalesStatusEnum.APPROVED.getStatus()).setAfterSaleReturnId(73L);
+ when(mapper.selectById(42L)).thenReturn(doc);
+ when(lines.getReturnSalesLineListByReturnId(42L)).thenReturn(List.of());
+ when(details.getReturnSalesDetailListByReturnId(42L)).thenReturn(List.of());
+ var service = new MesWmReturnSalesServiceImpl();
+ ReflectionTestUtils.setField(service, "returnSalesMapper", mapper);
+ ReflectionTestUtils.setField(service, "returnSalesLineService", lines);
+ ReflectionTestUtils.setField(service, "returnSalesDetailService", details);
+ ReflectionTestUtils.setField(service, "wmTransactionService", mock(MesWmTransactionService.class));
+ ReflectionTestUtils.setField(service, "afterSaleTicketApiProvider", provider);
+ assertThrows(RuntimeException.class, () -> service.stockReturnSales(42L));
+ }
+ @Test
+ void stockCompletionNotifiesSourceAfterSaleReturn() {
+ var mapper = mock(MesWmReturnSalesMapper.class);
+ var lines = mock(MesWmReturnSalesLineService.class);
+ var details = mock(MesWmReturnSalesDetailService.class);
+ var transactions = mock(MesWmTransactionService.class);
+ var api = mock(AfterSaleTicketApi.class);
+ @SuppressWarnings("unchecked") ObjectProvider<AfterSaleTicketApi> provider = mock(ObjectProvider.class);
+ when(provider.getIfAvailable()).thenReturn(api);
+ var doc = new MesWmReturnSalesDO().setId(42L).setStatus(MesWmReturnSalesStatusEnum.APPROVED.getStatus()).setAfterSaleReturnId(73L);
+ when(mapper.selectById(42L)).thenReturn(doc);
+ var line = new MesWmReturnSalesLineDO().setId(8L).setItemId(9L).setQuantity(BigDecimal.ONE);
+ var detail = new MesWmReturnSalesDetailDO().setLineId(8L).setItemId(9L).setQuantity(BigDecimal.ONE);
+ when(lines.getReturnSalesLineListByReturnId(42L)).thenReturn(List.of(line));
+ when(details.getReturnSalesDetailListByReturnId(42L)).thenReturn(List.of(detail));
+ when(api.onReturnInboundFinished(73L)).thenReturn(CommonResult.success(true));
+ var service = new MesWmReturnSalesServiceImpl();
+ ReflectionTestUtils.setField(service, "returnSalesMapper", mapper);
+ ReflectionTestUtils.setField(service, "returnSalesLineService", lines);
+ ReflectionTestUtils.setField(service, "returnSalesDetailService", details);
+ ReflectionTestUtils.setField(service, "wmTransactionService", transactions);
+ ReflectionTestUtils.setField(service, "afterSaleTicketApiProvider", provider);
+ service.stockReturnSales(42L);
+ verify(api).onReturnInboundFinished(73L);
+ }
+}
diff --git a/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesReturnQualityAfterSaleTest.java b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesReturnQualityAfterSaleTest.java
new file mode 100644
index 0000000..1c41e60
--- /dev/null
+++ b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesReturnQualityAfterSaleTest.java
@@ -0,0 +1,74 @@
+package cn.iocoder.yudao.module.mes.service.wm.returnsales;
+
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.module.aftersales.api.AfterSaleTicketApi;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnsales.MesWmReturnSalesDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnsales.MesWmReturnSalesLineDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.wm.returnsales.MesWmReturnSalesLineMapper;
+import cn.iocoder.yudao.module.mes.enums.wm.MesWmQualityStatusEnum;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.ObjectProvider;
+import org.springframework.test.util.ReflectionTestUtils;
+import java.math.BigDecimal;
+import java.util.List;
+import static org.mockito.Mockito.*;
+
+class MesReturnQualityAfterSaleTest {
+ @Test
+ void mixedQualityIsNotReportedAsFullyPassed() {
+ var mapper = mock(MesWmReturnSalesLineMapper.class);
+ var docs = mock(MesWmReturnSalesService.class);
+ var api = mock(AfterSaleTicketApi.class);
+ @SuppressWarnings("unchecked") ObjectProvider<AfterSaleTicketApi> provider = mock(ObjectProvider.class);
+ when(provider.getIfAvailable()).thenReturn(api);
+ var passed = new MesWmReturnSalesLineDO().setId(8L).setReturnId(42L).setQualityStatus(MesWmQualityStatusEnum.PASS.getStatus());
+ var failed = new MesWmReturnSalesLineDO().setId(9L).setReturnId(42L).setQualityStatus(MesWmQualityStatusEnum.FAIL.getStatus());
+ when(mapper.selectById(8L)).thenReturn(passed);
+ when(mapper.selectListByReturnId(42L)).thenReturn(List.of(passed, failed));
+ when(docs.validateReturnSalesExists(42L)).thenReturn(new MesWmReturnSalesDO().setId(42L).setAfterSaleReturnId(73L));
+ when(api.onReturnQualityFinished(73L, "瀛樺湪涓嶅悎鏍�", null)).thenReturn(CommonResult.success(true));
+ var service = new MesWmReturnSalesLineServiceImpl();
+ ReflectionTestUtils.setField(service, "returnSalesLineMapper", mapper);
+ ReflectionTestUtils.setField(service, "returnSalesService", docs);
+ ReflectionTestUtils.setField(service, "afterSaleTicketApiProvider", provider);
+ service.updateReturnSalesLineWhenRqcFinish(8L, 42L, 1, BigDecimal.ONE, BigDecimal.ZERO);
+ verify(api).onReturnQualityFinished(73L, "瀛樺湪涓嶅悎鏍�", null);
+ }
+ @Test
+ void pendingLinesDoNotReportCompletion() {
+ var mapper = mock(MesWmReturnSalesLineMapper.class);
+ var docs = mock(MesWmReturnSalesService.class);
+ var api = mock(AfterSaleTicketApi.class);
+ @SuppressWarnings("unchecked") ObjectProvider<AfterSaleTicketApi> provider = mock(ObjectProvider.class);
+ var line = new MesWmReturnSalesLineDO().setId(8L).setReturnId(42L).setQualityStatus(MesWmQualityStatusEnum.PASS.getStatus());
+ var pending = new MesWmReturnSalesLineDO().setId(9L).setReturnId(42L).setQualityStatus(MesWmQualityStatusEnum.PENDING.getStatus());
+ when(mapper.selectById(8L)).thenReturn(line);
+ when(mapper.selectListByReturnId(42L)).thenReturn(List.of(line, pending));
+ var service = new MesWmReturnSalesLineServiceImpl();
+ ReflectionTestUtils.setField(service, "returnSalesLineMapper", mapper);
+ ReflectionTestUtils.setField(service, "returnSalesService", docs);
+ ReflectionTestUtils.setField(service, "afterSaleTicketApiProvider", provider);
+ service.updateReturnSalesLineWhenRqcFinish(8L, 42L, 1, BigDecimal.ONE, BigDecimal.ZERO);
+ verifyNoInteractions(api);
+ verify(docs, never()).updateReturnSalesStatus(anyLong(), anyInt());
+ }
+ @Test
+ void allPassedResultsAreReportedToSourceReturn() {
+ var mapper = mock(MesWmReturnSalesLineMapper.class);
+ var docs = mock(MesWmReturnSalesService.class);
+ var api = mock(AfterSaleTicketApi.class);
+ @SuppressWarnings("unchecked") ObjectProvider<AfterSaleTicketApi> provider = mock(ObjectProvider.class);
+ when(provider.getIfAvailable()).thenReturn(api);
+ var line = new MesWmReturnSalesLineDO().setId(8L).setReturnId(42L).setQualityStatus(MesWmQualityStatusEnum.PASS.getStatus());
+ when(mapper.selectById(8L)).thenReturn(line);
+ when(mapper.selectListByReturnId(42L)).thenReturn(List.of(line));
+ when(docs.validateReturnSalesExists(42L)).thenReturn(new MesWmReturnSalesDO().setId(42L).setAfterSaleReturnId(73L));
+ when(api.onReturnQualityFinished(73L, "鍚堟牸", null)).thenReturn(CommonResult.success(true));
+ var service = new MesWmReturnSalesLineServiceImpl();
+ ReflectionTestUtils.setField(service, "returnSalesLineMapper", mapper);
+ ReflectionTestUtils.setField(service, "returnSalesService", docs);
+ ReflectionTestUtils.setField(service, "afterSaleTicketApiProvider", provider);
+ service.updateReturnSalesLineWhenRqcFinish(8L, 42L, 1, BigDecimal.ONE, BigDecimal.ZERO);
+ verify(api).onReturnQualityFinished(73L, "鍚堟牸", null);
+ }
+}
diff --git a/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/SalesNoticeOrderGuardTest.java b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/SalesNoticeOrderGuardTest.java
new file mode 100644
index 0000000..69f1b2e
--- /dev/null
+++ b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/SalesNoticeOrderGuardTest.java
@@ -0,0 +1,23 @@
+package cn.iocoder.yudao.module.mes.service.wm.salesnotice;
+
+import cn.iocoder.yudao.module.erp.api.sale.ErpSaleOrderApi;
+import cn.iocoder.yudao.module.mes.dal.mysql.wm.salesnotice.MesWmSalesNoticeMapper;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.salesnotice.MesWmSalesNoticeDO;
+import org.junit.jupiter.api.Test;
+import org.springframework.test.util.ReflectionTestUtils;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.Mockito.*;
+
+class SalesNoticeOrderGuardTest {
+ @Test
+ void cancelledOrderCannotGenerateDeliveryNotice() {
+ var orders = mock(ErpSaleOrderApi.class);
+ var notices = mock(MesWmSalesNoticeMapper.class);
+ when(orders.lockSaleOrderForNotice(1L, null)).thenThrow(new IllegalArgumentException("璁㈠崟宸蹭綔搴�"));
+ var service = new MesWmSalesNoticeServiceImpl();
+ ReflectionTestUtils.setField(service, "saleOrderApi", orders);
+ ReflectionTestUtils.setField(service, "salesNoticeMapper", notices);
+ assertThrows(RuntimeException.class, () -> service.generateSalesNoticeFromSaleOrder(1L));
+ verify(notices, never()).insert(any(MesWmSalesNoticeDO.class));
+ }
+}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/tender/SrmBidAwardServiceImpl.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/tender/SrmBidAwardServiceImpl.java
index a65fc6d..776739d 100644
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/tender/SrmBidAwardServiceImpl.java
+++ b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/tender/SrmBidAwardServiceImpl.java
@@ -181,11 +181,7 @@
if (CollUtil.isEmpty(quotes)) {
throw ServiceExceptionUtil.exception(ErrorCodeConstants.AWARD_QUOTE_NOT_EXISTS);
}
- Map<Long, SrmSupplierQuoteDO> quoteMap = quotes.stream()
- .collect(Collectors.toMap(
- SrmSupplierQuoteDO::getTenderMaterialId,
- Function.identity(),
- (a, b) -> a));
+ Map<Long, SrmSupplierQuoteDO> quoteMap = SrmPurchaseQuoteValidator.validate(materials, quotes);
// 5. 鎵归噺鏌� MDM 鐗╂枡锛岃幏鍙栬閲忓崟浣�
Set<Long> productIds = materials.stream()
@@ -193,6 +189,9 @@
.collect(Collectors.toSet());
Map<Long, MdmItemRespDTO> itemMap = mdmItemApi.getItemList(productIds).getCheckedData()
.stream().collect(Collectors.toMap(MdmItemRespDTO::getId, Function.identity()));
+ if (productIds.stream().anyMatch(productId -> !itemMap.containsKey(productId))) {
+ throw ServiceExceptionUtil.invalidParamException("瀛樺湪鏃犳硶鍖归厤鐨勭墿鏂欙紝璇峰厛缁存姢鐗╂枡鍚庡啀鐢熸垚閲囪喘璁㈠崟");
+ }
// 6. 鏋勫缓璁㈠崟椤癸紙鎶ヤ环涓衡�滃崟浠封�濆彛寰勶細琛岄噾棰� = 鎶ヤ环鍗曚环 脳 鏁伴噺锛�
// 瀹氭爣閲戦涓庢姤浠峰悎璁′笉涓�鑷存椂鎸夎閲戦姣斾緥鍒嗘憡锛岃鍗曡鍗曚环浠嶅彇鎶ヤ环鍗曚环锛�
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/tender/SrmPurchaseQuoteValidator.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/tender/SrmPurchaseQuoteValidator.java
new file mode 100644
index 0000000..0bf773b
--- /dev/null
+++ b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/tender/SrmPurchaseQuoteValidator.java
@@ -0,0 +1,31 @@
+package cn.iocoder.yudao.module.srm.service.tender;
+
+import cn.iocoder.yudao.module.srm.dal.dataobject.SrmSupplierQuoteDO;
+import cn.iocoder.yudao.module.srm.dal.dataobject.SrmTenderMaterialDO;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.invalidParamException;
+
+/** 鐢熸垚閲囪喘鍗曞墠鏍稿姣忎竴椤圭墿鏂欙紝閬垮厤闈欓粯涓㈠け璁㈠崟鏄庣粏銆� */
+final class SrmPurchaseQuoteValidator {
+ private SrmPurchaseQuoteValidator() {}
+
+ static Map<Long, SrmSupplierQuoteDO> validate(List<SrmTenderMaterialDO> materials, List<SrmSupplierQuoteDO> quotes) {
+ if (materials == null || materials.isEmpty()) throw invalidParamException("鎷涙爣椤圭洰娌℃湁鐗╂枡锛屼笉鑳界敓鎴愰噰璐鍗�");
+ Map<Long, SrmSupplierQuoteDO> byMaterial = new HashMap<>();
+ if (quotes != null) for (var quote : quotes) {
+ if (quote.getTenderMaterialId() == null || byMaterial.putIfAbsent(quote.getTenderMaterialId(), quote) != null)
+ throw invalidParamException("瀛樺湪閲嶅鎴栨棤鐗╂枡鐨勬姤浠凤紝璇峰厛鏍稿");
+ }
+ for (var material : materials) {
+ var quote = byMaterial.get(material.getId());
+ if (material.getId() == null || material.getProductId() == null || material.getQuantity() == null
+ || material.getQuantity().signum() <= 0 || quote == null || quote.getQuotePrice() == null
+ || quote.getQuotePrice().signum() < 0)
+ throw invalidParamException("瀛樺湪鏈姤浠锋垨鐗╂枡鏁伴噺鏃犳晥鐨勬槑缁嗭紝璇疯ˉ榻愬悗鍐嶇敓鎴愰噰璐鍗�");
+ }
+ if (byMaterial.size() != materials.size()) throw invalidParamException("鎶ヤ环鍖呭惈涓嶅睘浜庡綋鍓嶉」鐩殑鐗╂枡锛岃鏍稿");
+ return byMaterial;
+ }
+}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/tender/SrmTenderProjectServiceImpl.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/tender/SrmTenderProjectServiceImpl.java
index d6ce3f9..c5838c9 100644
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/tender/SrmTenderProjectServiceImpl.java
+++ b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/tender/SrmTenderProjectServiceImpl.java
@@ -342,11 +342,7 @@
if (CollUtil.isEmpty(quotes)) {
throw ServiceExceptionUtil.exception(ErrorCodeConstants.AWARD_QUOTE_NOT_EXISTS);
}
- Map<Long, SrmSupplierQuoteDO> quoteMap = quotes.stream()
- .collect(Collectors.toMap(
- SrmSupplierQuoteDO::getTenderMaterialId,
- Function.identity(),
- (a, b) -> a));
+ Map<Long, SrmSupplierQuoteDO> quoteMap = SrmPurchaseQuoteValidator.validate(materials, quotes);
// 鏌� MDM 鐗╂枡
Set<Long> productIds = materials.stream()
@@ -354,6 +350,9 @@
.collect(Collectors.toSet());
Map<Long, MdmItemRespDTO> itemMap = mdmItemApi.getItemList(productIds).getCheckedData()
.stream().collect(Collectors.toMap(MdmItemRespDTO::getId, Function.identity()));
+ if (productIds.stream().anyMatch(id -> !itemMap.containsKey(id))) {
+ throw ServiceExceptionUtil.invalidParamException("瀛樺湪鏃犳硶鍖归厤鐨勭墿鏂欙紝璇峰厛缁存姢鐗╂枡鍚庡啀鐢熸垚閲囪喘璁㈠崟");
+ }
// 璁$畻浠锋牸锛堟姤浠蜂负鈥滃崟浠封�濆彛寰勶細琛岄噾棰� = 鎶ヤ环鍗曚环 脳 鏁伴噺锛�
// 瀹氭爣閲戦涓庢姤浠峰悎璁′笉涓�鑷存椂鎸夎閲戦姣斾緥鍒嗘憡锛岃鍗曡鍗曚环浠嶅彇鎶ヤ环鍗曚环锛�
diff --git a/yudao-module-srm/src/test/java/cn/iocoder/yudao/module/srm/service/tender/SrmPurchaseQuoteValidationTest.java b/yudao-module-srm/src/test/java/cn/iocoder/yudao/module/srm/service/tender/SrmPurchaseQuoteValidationTest.java
new file mode 100644
index 0000000..a895cae
--- /dev/null
+++ b/yudao-module-srm/src/test/java/cn/iocoder/yudao/module/srm/service/tender/SrmPurchaseQuoteValidationTest.java
@@ -0,0 +1,22 @@
+package cn.iocoder.yudao.module.srm.service.tender;
+
+import cn.iocoder.yudao.module.srm.dal.dataobject.SrmSupplierQuoteDO;
+import cn.iocoder.yudao.module.srm.dal.dataobject.SrmTenderMaterialDO;
+import org.junit.jupiter.api.Test;
+import java.math.BigDecimal;
+import java.util.List;
+import static org.junit.jupiter.api.Assertions.*;
+
+class SrmPurchaseQuoteValidationTest {
+ private SrmTenderMaterialDO material(long id) { return new SrmTenderMaterialDO().setId(id).setProductId(id).setQuantity(BigDecimal.ONE); }
+ private SrmSupplierQuoteDO quote(long id) { return new SrmSupplierQuoteDO().setTenderMaterialId(id).setQuotePrice(BigDecimal.TEN); }
+ @Test void missingQuoteCannotCreatePartialOrder() {
+ assertThrows(RuntimeException.class, () -> SrmPurchaseQuoteValidator.validate(List.of(material(1),material(2)), List.of(quote(1))));
+ }
+ @Test void duplicateQuoteCannotSilentlyChooseOne() {
+ assertThrows(RuntimeException.class, () -> SrmPurchaseQuoteValidator.validate(List.of(material(1)), List.of(quote(1),quote(1))));
+ }
+ @Test void completeQuoteProducesAllMaterials() {
+ assertEquals(2, SrmPurchaseQuoteValidator.validate(List.of(material(1),material(2)), List.of(quote(1),quote(2))).size());
+ }
+}
diff --git a/yudao-module-srm/src/test/java/cn/iocoder/yudao/module/srm/service/tender/SrmQuoteOwnershipTest.java b/yudao-module-srm/src/test/java/cn/iocoder/yudao/module/srm/service/tender/SrmQuoteOwnershipTest.java
new file mode 100644
index 0000000..c39e0ef
--- /dev/null
+++ b/yudao-module-srm/src/test/java/cn/iocoder/yudao/module/srm/service/tender/SrmQuoteOwnershipTest.java
@@ -0,0 +1,49 @@
+package cn.iocoder.yudao.module.srm.service.tender;
+
+import cn.iocoder.yudao.module.srm.controller.admin.tender.vo.SrmSupplierQuoteSaveReqVO;
+import cn.iocoder.yudao.module.srm.dal.dataobject.*;
+import cn.iocoder.yudao.module.srm.dal.mysql.*;
+import org.junit.jupiter.api.Test;
+import org.springframework.test.util.ReflectionTestUtils;
+import java.math.BigDecimal;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.Mockito.*;
+import static org.mockito.ArgumentMatchers.*;
+
+class SrmQuoteOwnershipTest {
+ @Test void rejectsMaterialFromAnotherProject() {
+ var service = new SrmTenderBidServiceImpl();
+ var bids = mock(SrmTenderBidMapper.class); var projects = mock(SrmTenderProjectMapper.class);
+ var quotes = mock(SrmSupplierQuoteMapper.class); var materials = mock(SrmTenderMaterialMapper.class);
+ ReflectionTestUtils.setField(service, "tenderBidMapper", bids);
+ ReflectionTestUtils.setField(service, "tenderProjectMapper", projects);
+ ReflectionTestUtils.setField(service, "supplierQuoteMapper", quotes);
+ ReflectionTestUtils.setField(service, "tenderMaterialMapper", materials);
+ var bid = new SrmTenderBidDO(); bid.setId(1L); bid.setTenderProjectId(10L); bid.setBidStatus(0);
+ var project = new SrmTenderProjectDO(); project.setId(10L); project.setTenderStatus(10);
+ var material = new SrmTenderMaterialDO(); material.setId(9L); material.setTenderProjectId(11L);
+ when(bids.selectById(1L)).thenReturn(bid); when(projects.selectById(10L)).thenReturn(project);
+ when(materials.selectById(9L)).thenReturn(material);
+ var req = new SrmSupplierQuoteSaveReqVO(); req.setBidId(1L); req.setTenderMaterialId(9L); req.setQuotePrice(BigDecimal.ONE);
+ assertThrows(RuntimeException.class, () -> service.createQuote(req));
+ verify(quotes, never()).insert(any(SrmSupplierQuoteDO.class));
+ }
+
+ @Test void rejectsEditingQuoteWithAnotherBidId() {
+ var service = new SrmTenderBidServiceImpl();
+ var bids = mock(SrmTenderBidMapper.class); var projects = mock(SrmTenderProjectMapper.class);
+ var quotes = mock(SrmSupplierQuoteMapper.class); var materials = mock(SrmTenderMaterialMapper.class);
+ ReflectionTestUtils.setField(service, "tenderBidMapper", bids);
+ ReflectionTestUtils.setField(service, "tenderProjectMapper", projects);
+ ReflectionTestUtils.setField(service, "supplierQuoteMapper", quotes);
+ ReflectionTestUtils.setField(service, "tenderMaterialMapper", materials);
+ var bid = new SrmTenderBidDO(); bid.setId(1L); bid.setTenderProjectId(10L); bid.setBidStatus(0);
+ var project = new SrmTenderProjectDO(); project.setId(10L); project.setTenderStatus(10);
+ var quote = new SrmSupplierQuoteDO(); quote.setId(5L); quote.setBidId(2L); quote.setTenderMaterialId(9L);
+ when(bids.selectById(1L)).thenReturn(bid); when(projects.selectById(10L)).thenReturn(project);
+ when(quotes.selectById(5L)).thenReturn(quote);
+ var req = new SrmSupplierQuoteSaveReqVO(); req.setId(5L); req.setBidId(1L); req.setTenderMaterialId(9L); req.setQuotePrice(BigDecimal.ONE);
+ assertThrows(RuntimeException.class, () -> service.updateQuote(req));
+ verify(quotes, never()).updateById(any(SrmSupplierQuoteDO.class));
+ }
+}
diff --git a/yudao-module-srm/src/test/java/cn/iocoder/yudao/module/srm/service/tender/SrmTenderConfigServiceTest.java b/yudao-module-srm/src/test/java/cn/iocoder/yudao/module/srm/service/tender/SrmTenderConfigServiceTest.java
new file mode 100644
index 0000000..f5dbf0c
--- /dev/null
+++ b/yudao-module-srm/src/test/java/cn/iocoder/yudao/module/srm/service/tender/SrmTenderConfigServiceTest.java
@@ -0,0 +1,21 @@
+package cn.iocoder.yudao.module.srm.service.tender;
+
+import cn.iocoder.yudao.module.srm.dal.dataobject.SrmTenderConfigDO;
+import cn.iocoder.yudao.module.srm.dal.mysql.SrmTenderConfigMapper;
+import org.junit.jupiter.api.Test;
+import org.springframework.test.util.ReflectionTestUtils;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.mockito.Mockito.*;
+
+class SrmTenderConfigServiceTest {
+ @Test void readsAndUpdatesTheSameMostRecentlyEditedConfiguration() {
+ var mapper = mock(SrmTenderConfigMapper.class);
+ var config = new SrmTenderConfigDO(); config.setId(2L); config.setDefaultBiddingMode("FULL");
+ when(mapper.selectLatest()).thenReturn(config);
+ var service = new SrmTenderConfigServiceImpl();
+ ReflectionTestUtils.setField(service, "srmTenderConfigMapper", mapper);
+ assertSame(config, service.getConfig());
+ service.saveConfig("SIMPLE");
+ verify(mapper).updateById(config);
+ }
+}
--
Gitblit v1.9.3