feat: 根据商品查询供应商并集

yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/biz/ChangeFlowBiz.java

@@ -249,14 +249,11 @@ public class ChangeFlowBiz {
         List<ChangeExecConfigReq> changeExecProject = changeFlowCreateReq.getChangeExecProject();
         Assert.isTrue(changeExecProject.size() <= appConfig.getChangeExecLimit(),
                 "变更行动方案配置数超限");
+        // 校验变更行动方案中是否有重复的变更行动人
+        validateDuplicateChangeExecUser(changeExecProject);
         // 结束时间不可晚于第二天定时任务执行时间
         Long tomorrowSpecificTime = DateUtils.getTomorrowSpecificTime("00:00:00");
-        if (changeFlowCreateReq.getCreateSource() != 2) {
-            if (changeFlowCreateReq.getChangeConfirmResultTime() == null) {
-                throw ExceptionFactory.createBiz(ResponseCode.BAD_REQUEST, "变更结果确认时间不能为空");
-            }
         Assert.isTrue(changeFlowCreateReq.getChangeConfirmResultTime() >= tomorrowSpecificTime, "时间不可晚于下次执行时间");
-        }
         // 构建工单内容
         Map<String, Object> content = buildFlowContent(uid);
         // 构建变更类型

yanxuan-qc-change-system-dal/src/main/java/com/netease/mail/yanxuan/change/dal/meta/model/req/ChangeExecConfigReq.java

@@ -29,7 +29,7 @@ public class ChangeExecConfigReq {
     private Long changeTemplateId;
 
     /**
-     * 变更执行部门名
+     * 变更行动部门，（历史字段：变更执行部门名），改
      */
     @NotBlank(message = "变更执行部门名不能为空")
     private String changeExecDepartment;
@@ -65,7 +65,7 @@ public class ChangeExecConfigReq {
     private String changeChecking;
 
     /**
-     * 行动完成时间
+     * 变更完成时间（历史字段：行动完成时间）,改
      */
     private Long changeExecFinishTime;
 

yanxuan-qc-change-system-dal/src/main/java/com/netease/mail/yanxuan/change/dal/meta/model/req/ChangeFlowCreateReq.java

@@ -120,9 +120,9 @@ public class ChangeFlowCreateReq {
     private String changeProfitDesc;
 
     /**
-     * 变更结果确认时间
+     * 预计变更切换时间，（历史字段：变更结果确认时间），改
      */
-    //@NotNull(message = "变更结果确认时间不能为空")
+    @NotNull(message = "预计变更切换时间不能为空")
     private Long changeConfirmResultTime;
 
     /**
@@ -152,4 +152,11 @@ public class ChangeFlowCreateReq {
      * 变更收益金额
      */
     private String changeProfitAmount;
+
+    /**
+     * 批次说明，new
+     */
+    @Size(max = 500, message = "批次说明限500字")
+    private String batchDescription
+    ;
 }
\ No newline at end of file

yanxuan-qc-change-system-web/src/main/java/com/netease/mail/yanxuan/change/web/controller/SupplierController.java

@@ -96,6 +96,9 @@ public class SupplierController {
         log.info("[querySupplierByItemIds] 元数据 itemIds={}, itemSupplierList={}", 
             JSON.toJSONString(itemIds), JSON.toJSONString(itemSupplierList));
 
+        String detail = supplierSendService.queryGoodsPurchase(itemIds);
+        log.info("[queryGoodsCommander] purchase:{}", detail);
+
         if (CollectionUtils.isEmpty(itemSupplierList)) {
             return AjaxResult.success(new ArrayList<>());
         }