【品质异常通知单审核】增加4个字段（生产数量、检验数量、解决方案、处罚意见）

mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/saleorderpackingclause/SaleOrderPackingClauseController.java

@@ -39,6 +39,23 @@ public class SaleOrderPackingClauseController {
     @Resource
     private SaleOrderPackingClauseService saleOrderPackingClauseService;
 
+
+    @PostMapping("/save")
+    @Operation(summary = "创建生产订单包装规则")
+    @PreAuthorize("@ss.hasPermission('biz:sale-order-packing-clause:create')")
+    public CommonResult<Boolean> saveSaleOrderPackingClause(@Valid @RequestBody List<SaleOrderPackingClauseSaveReqVO> saveReqVO) {
+
+        saveReqVO.forEach(vo->{
+            if(vo.getId()==null || vo.getId()==0){
+                saleOrderPackingClauseService.createSaleOrderPackingClause(vo);
+            }else{
+                saleOrderPackingClauseService.updateSaleOrderPackingClause(vo);
+            }
+        });
+
+        return success(true);
+    }
+
     @PostMapping("/create")
     @Operation(summary = "创建生产订单包装规则")
     @PreAuthorize("@ss.hasPermission('biz:sale-order-packing-clause:create')")

mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/unqualifiednotification/vo/UnqualifiedNotificationSaveReqVO.java

@@ -73,4 +73,13 @@ public class UnqualifiedNotificationSaveReqVO {
     @Schema(description = "附件列表")
     private List<UnqualifiedNotificationFileReqVO> mediaList;
 
+    @Schema(description = "生产数量")
+    private Integer productAmount;
+    @Schema(description = "检验数量")
+    private  Integer checkAmount;
+    @Schema(description = "解决方案")
+    private String solutionContent;
+    @Schema(description = "处罚意见")
+    private String punishmentOpinion;
+
 }

mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/dataobject/saleorderpackingclause/SaleOrderPackingClauseDetailDO.java

@@ -1,5 +1,6 @@
 package com.chanko.yunxi.mes.module.biz.dal.dataobject.saleorderpackingclausedetail;
 
+import io.swagger.v3.oas.models.security.SecurityScheme;
 import lombok.*;
 import java.util.*;
 import java.time.LocalDateTime;
@@ -44,4 +45,6 @@ public class SaleOrderPackingClauseDetailDO extends BaseDO {
      */
     private Integer amount;
 
+    private Integer sort;
+
 }

sql/v1.0.0/2.business/1.structure.sql

@@ -368,6 +368,7 @@ CREATE TABLE `project_sale_order_packing_clause_detail` (
                                                             `clause_id` bigint(20) NOT NULL COMMENT '项目订单包装规则id',
                                                             `material_id` bigint(20) NOT NULL COMMENT '产品id',
                                                             `amount` int(10) DEFAULT NULL COMMENT '每箱配比',
+                                                            `sort` int(10) DEFAULT NULL COMMENT '显示序号',
                                                             `creator` varchar(64) DEFAULT '' COMMENT '创建者',
                                                             `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
                                                             `updater` varchar(64) DEFAULT '' COMMENT '更新者',