fix:修复点检保养问题

yudao-module-erp/yudao-module-erp-api/src/main/java/cn/iocoder/yudao/module/erp/enums/ErpAuditStatus.java

@@ -6,36 +6,22 @@ import lombok.RequiredArgsConstructor;
 
 import java.util.Arrays;
 
-/**
- * ERP 审核状态枚举
- *
- * TODO 芋艿：目前只有待审批、已审批两个状态，未来接入工作流后，会丰富下：待提交（草稿）=》已提交（待审核）=》审核通过、审核不通过；另外，工作流需要支持“反审核”，把工作流退回到原点；
- *
- * @author 芋道源码
- */
 @RequiredArgsConstructor
 @Getter
 public enum ErpAuditStatus implements IntArrayValuable {
 
-    DRAFT(0, "草稿"), // 审核中
-    UN_APPROVE(1, "驳回"), // 审核通过
-    PROCESS(10, "未审核"), // 审核中
-    APPROVE(20, "已审核"); // 审核通过
+    DRAFT(0, "待提交"),
+    UN_APPROVE(1, "已驳回"),
+    PROCESS(10, "审核中"),
+    APPROVE(20, "审核通过");
 
     public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(ErpAuditStatus::getStatus).toArray();
 
-    /**
-     * 状态
-     */
     private final Integer status;
-    /**
-     * 状态名
-     */
     private final String name;
 
     @Override
     public int[] array() {
         return ARRAYS;
     }
-
 }

yudao-module-erp/yudao-module-erp-api/src/main/java/cn/iocoder/yudao/module/erp/enums/ErrorCodeConstants.java

@@ -13,6 +13,11 @@ public interface ErrorCodeConstants {
     ErrorCode SUPPLIER_NOT_EXISTS = new ErrorCode(1_030_100_000, "供应商不存在");
     ErrorCode SUPPLIER_NOT_ENABLE = new ErrorCode(1_030_100_000, "供应商({})未启用");
 
+    // ========== ERP 包装方案（1-030-104-000） ==========
+    ErrorCode PACKAGING_SCHEME_NOT_EXISTS = new ErrorCode(1_030_104_000, "包装方案不存在");
+    ErrorCode PACKAGING_SCHEME_CODE_DUPLICATE = new ErrorCode(1_030_104_001, "包装方案编码已存在");
+    ErrorCode PACKAGING_SCHEME_NAME_DUPLICATE = new ErrorCode(1_030_104_002, "包装方案名称已存在");
+
     // ========== ERP 采购订单（1-030-101-000） ==========
     ErrorCode PURCHASE_ORDER_NOT_EXISTS = new ErrorCode(1_030_101_000, "采购订单不存在");
     ErrorCode PURCHASE_ORDER_DELETE_FAIL_APPROVE = new ErrorCode(1_030_101_001, "采购订单({})已审核，无法删除");
@@ -104,6 +109,14 @@ public interface ErrorCodeConstants {
     ErrorCode STOCK_IN_APPROVE_FAIL = new ErrorCode(1_030_401_003, "审核失败，只有未审核的入库单才能审核");
     ErrorCode STOCK_IN_NO_EXISTS = new ErrorCode(1_030_401_004, "生成入库单失败，请重新提交");
     ErrorCode STOCK_IN_UPDATE_FAIL_APPROVE = new ErrorCode(1_030_401_005, "其它入库单({})已审核，无法修改");
+    ErrorCode STOCK_IN_UPDATE_FAIL_PROCESS = new ErrorCode(1_030_401_006, "其它入库单({})审核中，无法修改");
+    ErrorCode STOCK_IN_DELETE_FAIL_PROCESS = new ErrorCode(1_030_401_007, "其它入库单({})审核中，无法删除");
+    ErrorCode STOCK_IN_SUBMIT_FAIL_STATUS = new ErrorCode(1_030_401_008, "提交审核失败，只有待提交或已驳回的入库单才能提交");
+    ErrorCode STOCK_IN_SUBMIT_FAIL_USER = new ErrorCode(1_030_401_009, "提交审核失败，只有创建人才能提交审核");
+    ErrorCode STOCK_IN_SUBMIT_FAIL_AUDIT_USER_EMPTY = new ErrorCode(1_030_401_010, "提交审核失败，请选择审核人");
+    ErrorCode STOCK_IN_AUDIT_FAIL_STATUS = new ErrorCode(1_030_401_011, "审核失败，只有审核中的入库单才能审核");
+    ErrorCode STOCK_IN_AUDIT_FAIL_USER = new ErrorCode(1_030_401_012, "审核失败，当前用户不是指定审核人");
+    ErrorCode STOCK_IN_AUDIT_FAIL_RESULT = new ErrorCode(1_030_401_013, "审核失败，审核结果只支持通过或驳回");
     ErrorCode STOCK_ALERADY_IN = new ErrorCode(1_030_401_005, "模具({})已经入库，无法继续操作入库");
     ErrorCode STOCK_ALERADY_OUT = new ErrorCode(1_030_401_005, "模具({})已经出库，无法继续操作出库");
 

yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/ErpPackagingSchemeController.java

@@ -0,0 +1,108 @@
+package cn.iocoder.yudao.module.erp.controller.admin.product;
+
+import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
+import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+import cn.iocoder.yudao.module.erp.controller.admin.product.vo.packagingscheme.ErpPackagingSchemePageReqVO;
+import cn.iocoder.yudao.module.erp.controller.admin.product.vo.packagingscheme.ErpPackagingSchemeRespVO;
+import cn.iocoder.yudao.module.erp.controller.admin.product.vo.packagingscheme.ErpPackagingSchemeSaveReqVO;
+import cn.iocoder.yudao.module.erp.dal.dataobject.product.ErpPackagingSchemeDO;
+import cn.iocoder.yudao.module.erp.service.product.ErpPackagingSchemeService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
+
+import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
+
+@Tag(name = "管理后台 - ERP 包装方案")
+@RestController
+@RequestMapping("/erp/packaging-scheme")
+@Validated
+public class ErpPackagingSchemeController {
+
+    @Resource
+    private ErpPackagingSchemeService packagingSchemeService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建包装方案")
+    @PreAuthorize("@ss.hasPermission('erp:packaging-scheme:create')")
+    public CommonResult<Long> createPackagingScheme(@Valid @RequestBody ErpPackagingSchemeSaveReqVO createReqVO) {
+        return success(packagingSchemeService.createPackagingScheme(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新包装方案")
+    @PreAuthorize("@ss.hasPermission('erp:packaging-scheme:update')")
+    public CommonResult<Boolean> updatePackagingScheme(@Valid @RequestBody ErpPackagingSchemeSaveReqVO updateReqVO) {
+        packagingSchemeService.updatePackagingScheme(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除包装方案")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('erp:packaging-scheme:delete')")
+    public CommonResult<Boolean> deletePackagingScheme(@RequestParam("id") Long id) {
+        packagingSchemeService.deletePackagingScheme(id);
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得包装方案")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('erp:packaging-scheme:query')")
+    public CommonResult<ErpPackagingSchemeRespVO> getPackagingScheme(@RequestParam("id") Long id) {
+        ErpPackagingSchemeDO scheme = packagingSchemeService.getPackagingScheme(id);
+        return success(BeanUtils.toBean(scheme, ErpPackagingSchemeRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得包装方案分页")
+    @PreAuthorize("@ss.hasPermission('erp:packaging-scheme:query')")
+    public CommonResult<PageResult<ErpPackagingSchemeRespVO>> getPackagingSchemePage(@Valid ErpPackagingSchemePageReqVO pageReqVO) {
+        PageResult<ErpPackagingSchemeDO> pageResult = packagingSchemeService.getPackagingSchemePage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, ErpPackagingSchemeRespVO.class));
+    }
+
+    @GetMapping("/simple-list")
+    @Operation(summary = "获得包装方案精简列表", description = "只包含已启用的包装方案")
+    public CommonResult<List<ErpPackagingSchemeRespVO>> getPackagingSchemeSimpleList() {
+        List<ErpPackagingSchemeDO> list = packagingSchemeService.getPackagingSchemeListByStatus(CommonStatusEnum.ENABLE.getStatus());
+        return success(convertList(list, item -> BeanUtils.toBean(item, ErpPackagingSchemeRespVO.class)));
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出包装方案 Excel")
+    @PreAuthorize("@ss.hasPermission('erp:packaging-scheme:export')")
+    @ApiAccessLog(operateType = EXPORT)
+    public void exportPackagingSchemeExcel(@Valid ErpPackagingSchemePageReqVO pageReqVO,
+                                           HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<ErpPackagingSchemeDO> list = packagingSchemeService.getPackagingSchemePage(pageReqVO).getList();
+        ExcelUtils.write(response, "包装方案.xls", "数据", ErpPackagingSchemeRespVO.class,
+                BeanUtils.toBean(list, ErpPackagingSchemeRespVO.class));
+    }
+
+}

yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/vo/packagingscheme/ErpPackagingSchemePageReqVO.java

@@ -0,0 +1,34 @@
+package cn.iocoder.yudao.module.erp.controller.admin.product.vo.packagingscheme;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - ERP 包装方案分页 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class ErpPackagingSchemePageReqVO extends PageParam {
+
+    @Schema(description = "方案编码", example = "BZFA202501010001")
+    private String code;
+
+    @Schema(description = "方案名称", example = "标准包装方案")
+    private String name;
+
+    @Schema(description = "状态", example = "0")
+    private Integer status;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+}

yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/vo/packagingscheme/ErpPackagingSchemeRespVO.java

@@ -0,0 +1,56 @@
+package cn.iocoder.yudao.module.erp.controller.admin.product.vo.packagingscheme;
+
+import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
+import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
+import cn.iocoder.yudao.module.system.enums.DictTypeConstants;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@Schema(description = "管理后台 - ERP 包装方案 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class ErpPackagingSchemeRespVO {
+
+    @Schema(description = "包装方案编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @ExcelProperty("编号")
+    private Long id;
+
+    @Schema(description = "方案编码", requiredMode = Schema.RequiredMode.REQUIRED, example = "BZFA202501010001")
+    @ExcelProperty("方案编码")
+    private String code;
+
+    @Schema(description = "方案名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "标准包装方案")
+    @ExcelProperty("方案名称")
+    private String name;
+
+    @Schema(description = "每包数量（件）", requiredMode = Schema.RequiredMode.REQUIRED, example = "100")
+    @ExcelProperty("每包数量（件）")
+    private BigDecimal packageQuantity;
+
+    @Schema(description = "每托包数（包）", requiredMode = Schema.RequiredMode.REQUIRED, example = "20")
+    @ExcelProperty("每托包数（包）")
+    private BigDecimal palletPackageQuantity;
+
+    @Schema(description = "每托总数量（件）", requiredMode = Schema.RequiredMode.REQUIRED, example = "2000")
+    @ExcelProperty("每托总数量（件）")
+    private BigDecimal palletTotalQuantity;
+
+    @Schema(description = "备注", example = "默认包装")
+    @ExcelProperty("备注")
+    private String remark;
+
+    @Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "0")
+    @ExcelProperty(value = "状态", converter = DictConvert.class)
+    @DictFormat(DictTypeConstants.COMMON_STATUS)
+    private Integer status;
+
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+}

yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/vo/packagingscheme/ErpPackagingSchemeSaveReqVO.java

@@ -0,0 +1,48 @@
+package cn.iocoder.yudao.module.erp.controller.admin.product.vo.packagingscheme;
+
+import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
+import cn.iocoder.yudao.framework.common.validation.InEnum;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import javax.validation.constraints.DecimalMin;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+
+@Schema(description = "管理后台 - ERP 包装方案新增/修改 Request VO")
+@Data
+public class ErpPackagingSchemeSaveReqVO {
+
+    @Schema(description = "包装方案编号", example = "1")
+    private Long id;
+
+    @Schema(description = "方案编码", example = "BZFA202501010001")
+    private String code;
+
+    @Schema(description = "方案名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "标准包装方案")
+    @NotBlank(message = "方案名称不能为空")
+    private String name;
+
+    @Schema(description = "每包数量（件）", requiredMode = Schema.RequiredMode.REQUIRED, example = "100")
+    @NotNull(message = "每包数量不能为空")
+    @DecimalMin(value = "0", inclusive = false, message = "每包数量必须大于 0")
+    private BigDecimal packageQuantity;
+
+    @Schema(description = "每托包数（包）", requiredMode = Schema.RequiredMode.REQUIRED, example = "20")
+    @NotNull(message = "每托包数不能为空")
+    @DecimalMin(value = "0", inclusive = false, message = "每托包数必须大于 0")
+    private BigDecimal palletPackageQuantity;
+
+    @Schema(description = "每托总数量（件）", example = "2000")
+    private BigDecimal palletTotalQuantity;
+
+    @Schema(description = "备注", example = "默认包装")
+    private String remark;
+
+    @Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "0")
+    @NotNull(message = "状态不能为空")
+    @InEnum(CommonStatusEnum.class)
+    private Integer status;
+
+}

yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/vo/product/ErpProductRespVO.java

@@ -93,6 +93,27 @@ public class ErpProductRespVO extends ErpProductDO {
     @ExcelProperty("预警库存")
     private BigDecimal safetyNumber;
 
+    @Schema(description = "默认仓库 ID", example = "1")
+    private Long defaultWarehouseId;
+
+    @Schema(description = "默认仓库名称", example = "成品仓")
+    private String defaultWarehouseName;
+
+    @Schema(description = "是否易损件", example = "1")
+    private Integer fragileFlag;
+
+    @Schema(description = "采购周期（天）", example = "30")
+    private Integer purchaseCycle;
+
+    @Schema(description = "备件等级", example = "A")
+    private String sparePartLevel;
+
+    @Schema(description = "品牌", example = "SKF")
+    private String brand;
+
+    @Schema(description = "型号", example = "6205-2RS")
+    private String model;
+
     @Schema(description = "二维码地址", example = "")
     private String qrcodeUrl;
 //
@@ -110,4 +131,16 @@ public class ErpProductRespVO extends ErpProductDO {
 
     @Schema(description = "关联模具列表")
     private List<ProductRelationRespVO> molds;
+
+    @Schema(description = "可用包装方案列表")
+    private List<ProductPackagingSchemeRespVO> packagingSchemes;
+
+    @Schema(description = "默认包装方案 ID", example = "1")
+    private Long defaultPackagingSchemeId;
+
+    @Schema(description = "供应商列表")
+    private List<ProductSupplierRespVO> suppliers;
+
+    @Schema(description = "默认供应商 ID", example = "1")
+    private Long defaultSupplierId;
 }

yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/vo/product/ProductPackagingSchemeRespVO.java

@@ -0,0 +1,33 @@
+package cn.iocoder.yudao.module.erp.controller.admin.product.vo.product;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Schema(description = "管理后台 - 产品关联包装方案 Response VO")
+@Data
+public class ProductPackagingSchemeRespVO {
+
+    @Schema(description = "关联记录 ID", example = "1")
+    private Long id;
+
+    @Schema(description = "包装方案 ID", example = "1")
+    private Long packagingSchemeId;
+
+    @Schema(description = "包装方案名称", example = "标准包装方案")
+    private String packagingSchemeName;
+
+    @Schema(description = "每包数量（件）", example = "100")
+    private BigDecimal packageQuantity;
+
+    @Schema(description = "每托包数（包）", example = "20")
+    private BigDecimal palletPackageQuantity;
+
+    @Schema(description = "每托总数量（件）", example = "2000")
+    private BigDecimal palletTotalQuantity;
+
+    @Schema(description = "是否默认方案", example = "1")
+    private Integer defaultStatus;
+
+}

yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/vo/product/ProductPackagingSchemeSaveReqVO.java

@@ -0,0 +1,19 @@
+package cn.iocoder.yudao.module.erp.controller.admin.product.vo.product;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+@Schema(description = "管理后台 - 产品关联包装方案 Request VO")
+@Data
+public class ProductPackagingSchemeSaveReqVO {
+
+    @Schema(description = "包装方案 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @NotNull(message = "包装方案 ID 不能为空")
+    private Long packagingSchemeId;
+
+    @Schema(description = "是否默认方案", example = "1")
+    private Integer defaultStatus;
+
+}

yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/vo/product/ProductSaveReqVO.java

@@ -4,6 +4,7 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import javax.validation.Valid;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
@@ -63,9 +64,41 @@ public class ProductSaveReqVO {
     @Schema(description = "预警库存", example = "161.87")
     private BigDecimal safetyNumber;
 
+    @Schema(description = "默认仓库 ID", example = "1")
+    private Long defaultWarehouseId;
+
+    @Schema(description = "是否易损件", example = "1")
+    private Integer fragileFlag;
+
+    @Schema(description = "采购周期（天）", example = "30")
+    private Integer purchaseCycle;
+
+    @Schema(description = "备件等级", example = "A")
+    private String sparePartLevel;
+
+    @Schema(description = "品牌", example = "SKF")
+    private String brand;
+
+    @Schema(description = "型号", example = "6205-2RS")
+    private String model;
+
     @Schema(description = "关联设备ID列表", example = "[11,15,23]")
     private List<Long> deviceIds;
 
     @Schema(description = "关联模具D列表", example = "[11,15,23]")
     private List<Long> moldIds;
-}
+
+    @Schema(description = "可用包装方案列表")
+    @Valid
+    private List<ProductPackagingSchemeSaveReqVO> packagingSchemes;
+
+    @Schema(description = "默认包装方案 ID", example = "1")
+    private Long defaultPackagingSchemeId;
+
+    @Schema(description = "供应商列表")
+    @Valid
+    private List<ProductSupplierSaveReqVO> suppliers;
+
+    @Schema(description = "默认供应商 ID", example = "1")
+    private Long defaultSupplierId;
+}

yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/vo/product/ProductSupplierRespVO.java

@@ -0,0 +1,22 @@
+package cn.iocoder.yudao.module.erp.controller.admin.product.vo.product;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Schema(description = "管理后台 - 产品关联供应商 Response VO")
+@Data
+public class ProductSupplierRespVO {
+
+    @Schema(description = "关联记录 ID", example = "1")
+    private Long id;
+
+    @Schema(description = "供应商 ID", example = "1")
+    private Long supplierId;
+
+    @Schema(description = "供应商名称", example = "默认供应商")
+    private String supplierName;
+
+    @Schema(description = "是否默认供应商", example = "1")
+    private Integer defaultStatus;
+
+}

yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/vo/product/ProductSupplierSaveReqVO.java

@@ -0,0 +1,19 @@
+package cn.iocoder.yudao.module.erp.controller.admin.product.vo.product;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+@Schema(description = "管理后台 - 产品关联供应商 Request VO")
+@Data
+public class ProductSupplierSaveReqVO {
+
+    @Schema(description = "供应商 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @NotNull(message = "供应商 ID 不能为空")
+    private Long supplierId;
+
+    @Schema(description = "是否默认供应商", example = "1")
+    private Integer defaultStatus;
+
+}

yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/ErpStockInController.java

@@ -6,30 +6,41 @@ import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
+import cn.iocoder.yudao.framework.common.util.number.NumberUtils;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
 import cn.iocoder.yudao.framework.ratelimiter.core.annotation.RateLimiter;
+import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
 import cn.iocoder.yudao.module.common.dal.dataobject.mold.MoldBrandDO;
 import cn.iocoder.yudao.module.erp.controller.admin.product.vo.product.ErpProductRespVO;
+import cn.iocoder.yudao.module.erp.controller.admin.stock.vo.in.ErpStockInApproveRecordRespVO;
+import cn.iocoder.yudao.module.erp.controller.admin.stock.vo.in.ErpStockInAuditReqVO;
 import cn.iocoder.yudao.module.erp.controller.admin.stock.vo.in.ErpStockInPageReqVO;
 import cn.iocoder.yudao.module.erp.controller.admin.stock.vo.in.ErpStockInRespVO;
 import cn.iocoder.yudao.module.erp.controller.admin.stock.vo.in.ErpStockInSaveReqVO;
+import cn.iocoder.yudao.module.erp.controller.admin.stock.vo.in.ErpStockInSubmitReqVO;
 import cn.iocoder.yudao.module.erp.controller.admin.stock.vo.in.StockInTypeEnum;
 import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpSupplierDO;
 import cn.iocoder.yudao.module.erp.dal.dataobject.stock.ErpStockDO;
+import cn.iocoder.yudao.module.erp.dal.dataobject.stock.ErpStockInApproveRecordDO;
 import cn.iocoder.yudao.module.erp.dal.dataobject.stock.ErpStockInDO;
 import cn.iocoder.yudao.module.erp.dal.dataobject.stock.ErpStockInItemDO;
+import cn.iocoder.yudao.module.erp.dal.dataobject.stock.ErpWarehouseDO;
+import cn.iocoder.yudao.module.erp.dal.dataobject.warehousearea.WarehouseAreaDO;
 import cn.iocoder.yudao.module.erp.service.mold.MoldBrandService;
 import cn.iocoder.yudao.module.erp.service.mold.MoldService;
 import cn.iocoder.yudao.module.erp.service.product.ErpProductService;
 import cn.iocoder.yudao.module.erp.service.purchase.ErpSupplierService;
 import cn.iocoder.yudao.module.erp.service.stock.ErpStockInService;
 import cn.iocoder.yudao.module.erp.service.stock.ErpStockService;
+import cn.iocoder.yudao.module.erp.service.stock.ErpWarehouseService;
+import cn.iocoder.yudao.module.erp.service.warehousearea.WarehouseAreaService;
 import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
 import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
@@ -41,15 +52,17 @@ import javax.validation.Valid;
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.concurrent.TimeUnit;
+import java.util.stream.Stream;
 
 import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
-import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMultiMap;
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertListByFlatMap;
 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
 
 @Tag(name = "管理后台 - ERP 其它入库单")
@@ -66,12 +79,14 @@ public class ErpStockInController {
     private ErpProductService productService;
     @Resource
     private ErpSupplierService supplierService;
-
+    @Resource
+    private ErpWarehouseService warehouseService;
+    @Resource
+    private WarehouseAreaService warehouseAreaService;
     @Resource
     private MoldBrandService moldBrandService;
     @Resource
     private MoldService moldService;
-
     @Resource
     private AdminUserApi adminUserApi;
 
@@ -96,11 +111,36 @@ public class ErpStockInController {
     @RateLimiter(count = 1, timeUnit = TimeUnit.SECONDS)
     public CommonResult<Boolean> updateStockInStatus(@RequestParam("id") Long id,
                                                      @RequestParam("status") Integer status,
-                                                     @RequestParam(name = "status",required = false) Integer bizType) {
-        stockInService.updateStockInStatus(id, status,bizType);
+                                                     @RequestParam(name = "bizType", required = false) Integer bizType) {
+        stockInService.updateStockInStatus(id, status, bizType);
+        return success(true);
+    }
+
+    @PutMapping("/submit")
+    @Operation(summary = "提交其它入库单审核")
+    @PreAuthorize("@ss.hasPermission('erp:stock-in:update')")
+    @RateLimiter(count = 1, timeUnit = TimeUnit.SECONDS)
+    public CommonResult<Boolean> submitStockInAudit(@Valid @RequestBody ErpStockInSubmitReqVO submitReqVO) {
+        stockInService.submitStockInAudit(submitReqVO);
+        return success(true);
+    }
+
+    @PutMapping("/audit")
+    @Operation(summary = "审核其它入库单")
+    @PreAuthorize("@ss.hasPermission('erp:stock-in:update-status')")
+    @RateLimiter(count = 1, timeUnit = TimeUnit.SECONDS)
+    public CommonResult<Boolean> auditStockIn(@Valid @RequestBody ErpStockInAuditReqVO auditReqVO) {
+        stockInService.auditStockIn(auditReqVO);
         return success(true);
     }
 
+    @GetMapping("/approve-record-list")
+    @Operation(summary = "获得其它入库单审核记录")
+    @PreAuthorize("@ss.hasPermission('erp:stock-in:query')")
+    public CommonResult<List<ErpStockInApproveRecordRespVO>> getApproveRecordList(@RequestParam("id") Long id) {
+        return success(buildApproveRecordRespList(stockInService.getStockInApproveRecordList(id)));
+    }
+
     @DeleteMapping("/delete")
     @Operation(summary = "删除其它入库单")
     @Parameter(name = "ids", description = "编号数组", required = true)
@@ -119,56 +159,17 @@ public class ErpStockInController {
         if (stockIn == null) {
             return success(null);
         }
-        List<ErpStockInItemDO> stockInItemList = stockInService.getStockInItemListByInId(id);
-        if (Objects.equals(stockIn.getInType(), "模具入库")) {
-            Map<Long, MoldBrandDO> moldMap = moldBrandService.getMoldVOMap(
-                    convertSet(stockInItemList, ErpStockInItemDO::getMoldSetId));
-            Map<Long, List<cn.iocoder.yudao.module.common.dal.dataobject.mold.MoldDO>> moldListMap = moldService.getMoldListMapByBrandIds(
-                    convertSet(stockInItemList, ErpStockInItemDO::getMoldSetId));
-            return success(BeanUtils.toBean(stockIn, ErpStockInRespVO.class, stockInVO -> {
-                stockInVO.setItems(convertList(stockInItemList, source -> {
-                    ErpStockInRespVO.Item item = BeanUtils.toBean(source, ErpStockInRespVO.Item.class);
-                    item.setMoldSetId(source.getMoldSetId());
-                    item.setMoldSetName(source.getMoldSetName());
-                    ErpStockDO stock = stockService.getStock(source.getMoldSetId(), source.getWarehouseId());
-                    item.setStockCount(stock != null ? stock.getCount() : BigDecimal.ZERO);
-                    item.setMoldList(moldListMap.getOrDefault(source.getMoldSetId(), new ArrayList<>()));
-                    MapUtils.findAndThen(moldMap, source.getMoldSetId(), mold -> item.setMoldSetName(mold.getName())
-                            .setProductName(mold.getName())
-                            .setProductBarCode(mold.getCode()));
-                    return item;
-                }));
-                stockInVO.setMoldSetNames(CollUtil.join(stockInVO.getItems(), ",", ErpStockInRespVO.Item::getMoldSetName));
-                stockInVO.setProductNames(stockInVO.getMoldSetNames());
-            }));
-        } else {
-            Map<Long, ErpProductRespVO> productMap = productService.getProductVOMap(
-                    convertSet(stockInItemList, ErpStockInItemDO::getProductId));
-            return success(BeanUtils.toBean(stockIn, ErpStockInRespVO.class, stockInVO ->
-                    stockInVO.setItems(BeanUtils.toBean(stockInItemList, ErpStockInRespVO.Item.class, item -> {
-                        ErpStockDO stock = stockService.getStock(item.getProductId(), item.getWarehouseId());
-                        item.setStockCount(stock != null ? stock.getCount() : BigDecimal.ZERO);
-                        MapUtils.findAndThen(productMap, item.getProductId(), product -> item.setProductName(product.getName())
-                                .setProductBarCode(product.getBarCode()).setProductUnitName(product.getUnitName()));
-                    }))));
-        }
-
+        return success(buildStockInRespVO(stockIn,
+                stockInService.getStockInItemListByInId(id),
+                stockInService.getStockInApproveRecordList(id)));
     }
 
     @GetMapping("/page")
     @Operation(summary = "获得其它入库单分页")
     @PreAuthorize("@ss.hasPermission('erp:stock-in:query')")
     public CommonResult<PageResult<ErpStockInRespVO>> getStockInPage(@Valid ErpStockInPageReqVO pageReqVO) {
-       if(StringUtils.isEmpty(pageReqVO.getInType())){
-           List<String> list = new ArrayList<>();
-           list.add(StockInTypeEnum.产品入库.getValue());
-           list.add(StockInTypeEnum.其他入库.getValue());
-           list.add(StockInTypeEnum.原料入库.getValue());
-           list.add(StockInTypeEnum.备件入库.getValue());
-           pageReqVO.setInTypeList(list);
-       }
-        PageResult<ErpStockInDO> pageResult = stockInService.getStockInPage(pageReqVO);
-        return success(buildStockInVOPageResult(pageResult));
+        fillPageReqDefault(pageReqVO);
+        return success(buildStockInVOPageResult(stockInService.getStockInPage(pageReqVO)));
     }
 
     @GetMapping("/export-excel")
@@ -176,58 +177,124 @@ public class ErpStockInController {
     @PreAuthorize("@ss.hasPermission('erp:stock-in:export')")
     @ApiAccessLog(operateType = EXPORT)
     public void exportStockInExcel(@Valid ErpStockInPageReqVO pageReqVO,
-              HttpServletResponse response) throws IOException {
+                                   HttpServletResponse response) throws IOException {
+        fillPageReqDefault(pageReqVO);
         pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
         List<ErpStockInRespVO> list = buildStockInVOPageResult(stockInService.getStockInPage(pageReqVO)).getList();
-        // 导出 Excel
         ExcelUtils.write(response, "其它入库单.xls", "数据", ErpStockInRespVO.class, list);
     }
 
+    private void fillPageReqDefault(ErpStockInPageReqVO pageReqVO) {
+        if (Boolean.TRUE.equals(pageReqVO.getRelatedToMe())) {
+            pageReqVO.setCurrentUserId(SecurityFrameworkUtils.getLoginUserId());
+        }
+        if (StringUtils.isEmpty(pageReqVO.getInType())) {
+            List<String> list = new ArrayList<>();
+            list.add(StockInTypeEnum.产品入库.getValue());
+            list.add(StockInTypeEnum.其他入库.getValue());
+            list.add(StockInTypeEnum.原料入库.getValue());
+            list.add(StockInTypeEnum.备件入库.getValue());
+            pageReqVO.setInTypeList(list);
+        }
+    }
+
     private PageResult<ErpStockInRespVO> buildStockInVOPageResult(PageResult<ErpStockInDO> pageResult) {
         if (CollUtil.isEmpty(pageResult.getList())) {
             return PageResult.empty(pageResult.getTotal());
         }
-        List<ErpStockInItemDO> stockInItemList = stockInService.getStockInItemListByInIds(
-                convertSet(pageResult.getList(), ErpStockInDO::getId));
-        Map<Long, List<ErpStockInItemDO>> stockInItemMap = convertMultiMap(stockInItemList, ErpStockInItemDO::getInId);
-        Map<Long, ErpProductRespVO> productMap = productService.getProductVOMap(
-                convertSet(stockInItemList, ErpStockInItemDO::getProductId));
-        Map<Long, ErpSupplierDO> supplierMap = supplierService.getSupplierMap(
-                convertSet(pageResult.getList(), ErpStockInDO::getSupplierId));
-        Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(
-                convertSet(pageResult.getList(), stockIn -> Long.parseLong(stockIn.getCreator())));
-        Map<Long, MoldBrandDO> moldMap = moldBrandService.getMoldVOMap(
-                convertSet(stockInItemList, ErpStockInItemDO::getMoldSetId));
-        Map<Long, List<cn.iocoder.yudao.module.common.dal.dataobject.mold.MoldDO>> moldListMap = moldService.getMoldListMapByBrandIds(
-                convertSet(stockInItemList, ErpStockInItemDO::getMoldSetId));
+        List<ErpStockInRespVO> list = convertList(pageResult.getList(), stockIn -> buildStockInRespVO(
+                stockIn, stockInService.getStockInItemListByInId(stockIn.getId()), Collections.emptyList()));
+        return new PageResult<>(list, pageResult.getTotal());
+    }
+
+    private ErpStockInRespVO buildStockInRespVO(ErpStockInDO stockIn, List<ErpStockInItemDO> stockInItemList,
+                                                List<ErpStockInApproveRecordDO> approveRecords) {
+        ErpStockInRespVO stockInVO = BeanUtils.toBean(stockIn, ErpStockInRespVO.class);
+        Map<Long, ErpWarehouseDO> warehouseMap = warehouseService.getWarehouseMap(
+                convertSet(stockInItemList, ErpStockInItemDO::getWarehouseId));
+        Map<Long, WarehouseAreaDO> areaMap = warehouseAreaService.getWarehouseAreaMap(
+                convertSet(stockInItemList, ErpStockInItemDO::getAreaId));
+        Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(convertListByFlatMap(
+                Collections.singletonList(stockIn), item -> Stream.of(NumberUtils.parseLong(item.getCreator()),
+                        item.getStockUserId(), item.getAuditUserId())));
+        MapUtils.findAndThen(userMap, NumberUtils.parseLong(stockIn.getCreator()), user -> stockInVO.setCreatorName(user.getNickname()));
+        MapUtils.findAndThen(userMap, stockIn.getStockUserId(), user -> stockInVO.setStockUserName(user.getNickname()));
+        MapUtils.findAndThen(userMap, stockIn.getAuditUserId(), user -> stockInVO.setAuditUserName(user.getNickname()));
+
+        if (Objects.equals(stockIn.getInType(), "模具入库")) {
+            Map<Long, MoldBrandDO> moldMap = moldBrandService.getMoldVOMap(
+                    convertSet(stockInItemList, ErpStockInItemDO::getMoldSetId));
+            Map<Long, List<cn.iocoder.yudao.module.common.dal.dataobject.mold.MoldDO>> moldListMap = moldService.getMoldListMapByBrandIds(
+                    convertSet(stockInItemList, ErpStockInItemDO::getMoldSetId));
+            stockInVO.setItems(convertList(stockInItemList, source -> {
+                ErpStockInRespVO.Item item = BeanUtils.toBean(source, ErpStockInRespVO.Item.class);
+                ErpStockDO stock = stockService.getStock(source.getMoldSetId(), source.getWarehouseId());
+                item.setStockCount(stock != null ? stock.getCount() : BigDecimal.ZERO);
+                item.setMoldList(moldListMap.getOrDefault(source.getMoldSetId(), new ArrayList<>()));
+                fillWarehouseInfo(item, source, warehouseMap, areaMap);
+                MapUtils.findAndThen(moldMap, source.getMoldSetId(), mold -> {
+                    item.setMoldSetName(mold.getName());
+                    item.setProductName(mold.getName());
+                    item.setProductBarCode(mold.getCode());
+                });
+                return item;
+            }));
+            stockInVO.setMoldSetNames(CollUtil.join(stockInVO.getItems(), ",", ErpStockInRespVO.Item::getMoldSetName));
+            stockInVO.setProductNames(stockInVO.getMoldSetNames());
+        } else {
+            Map<Long, ErpProductRespVO> productMap = productService.getProductVOMap(
+                    convertSet(stockInItemList, ErpStockInItemDO::getProductId));
+            stockInVO.setItems(BeanUtils.toBean(stockInItemList, ErpStockInRespVO.Item.class, item -> {
+                ErpStockDO stock = stockService.getStock(item.getProductId(), item.getWarehouseId());
+                item.setStockCount(stock != null ? stock.getCount() : BigDecimal.ZERO);
+                if (StringUtils.isBlank(item.getWarehouseName())) {
+                    MapUtils.findAndThen(warehouseMap, item.getWarehouseId(), warehouse -> item.setWarehouseName(warehouse.getName()));
+                }
+                if (StringUtils.isBlank(item.getAreaName())) {
+                    MapUtils.findAndThen(areaMap, item.getAreaId(), area -> item.setAreaName(area.getAreaName()));
+                }
+                MapUtils.findAndThen(productMap, item.getProductId(), product -> {
+                    item.setProductName(product.getName());
+                    item.setProductBarCode(product.getBarCode());
+                    item.setProductUnitName(product.getUnitName());
+                });
+            }));
+            stockInVO.setProductNames(CollUtil.join(stockInVO.getItems(), ",", ErpStockInRespVO.Item::getProductName));
+        }
 
-        return BeanUtils.toBean(pageResult, ErpStockInRespVO.class, stockIn -> {
-            if (Objects.equals(stockIn.getInType(), "模具入库")) {
-                List<ErpStockInItemDO> itemDOS = stockInItemMap.get(stockIn.getId());
-                stockIn.setItems(convertList(itemDOS, source -> {
-                    ErpStockInRespVO.Item item = BeanUtils.toBean(source, ErpStockInRespVO.Item.class);
-                    item.setMoldSetId(source.getMoldSetId());
-                    item.setMoldSetName(source.getMoldSetName());
-                    item.setMoldList(moldListMap.getOrDefault(source.getMoldSetId(), new ArrayList<>()));
-                    MapUtils.findAndThen(moldMap, source.getMoldSetId(), mold -> item.setMoldSetName(mold.getName())
-                            .setProductName(mold.getName())
-                            .setProductBarCode(mold.getCode()));
-                    return item;
-                }));
-                stockIn.setMoldSetNames(CollUtil.join(stockIn.getItems(), ",", ErpStockInRespVO.Item::getMoldSetName));
-                stockIn.setProductNames(stockIn.getMoldSetNames());
-            } else {
-                stockIn.setItems(BeanUtils.toBean(stockInItemMap.get(stockIn.getId()), ErpStockInRespVO.Item.class,
-                        item -> MapUtils.findAndThen(productMap, item.getProductId(), product -> item.setProductName(product.getName())
-                                .setProductBarCode(product.getBarCode()).setProductUnitName(product.getUnitName()))));
-                stockIn.setProductNames(CollUtil.join(stockIn.getItems(), ",", ErpStockInRespVO.Item::getProductName));
+        if (stockIn.getSupplierId() != null) {
+            Map<Long, ErpSupplierDO> supplierMap = supplierService.getSupplierMap(Collections.singleton(stockIn.getSupplierId()));
+            MapUtils.findAndThen(supplierMap, stockIn.getSupplierId(), supplier -> stockInVO.setSupplierName(supplier.getName()));
+        }
+        stockInVO.setApproveRecords(buildApproveRecordRespList(approveRecords));
+        return stockInVO;
+    }
 
-            }
-            MapUtils.findAndThen(supplierMap, stockIn.getSupplierId(), supplier -> stockIn.setSupplierName(supplier.getName()));
-            MapUtils.findAndThen(userMap, Long.parseLong(stockIn.getCreator()), user -> stockIn.setCreatorName(user.getNickname()));
+    private List<ErpStockInApproveRecordRespVO> buildApproveRecordRespList(List<ErpStockInApproveRecordDO> records) {
+        if (CollUtil.isEmpty(records)) {
+            return new ArrayList<>();
+        }
+        Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(convertListByFlatMap(records,
+                record -> Stream.of(NumberUtils.parseLong(record.getCreator()), record.getTargetUserId())));
+        return BeanUtils.toBean(records, ErpStockInApproveRecordRespVO.class, record -> {
+            MapUtils.findAndThen(userMap, NumberUtils.parseLong(record.getCreator()), user -> record.setCreatorName(user.getNickname()));
+            MapUtils.findAndThen(userMap, record.getTargetUserId(), user -> record.setTargetUserName(user.getNickname()));
         });
     }
 
+    private void fillWarehouseInfo(ErpStockInRespVO.Item item, ErpStockInItemDO source,
+                                   Map<Long, ErpWarehouseDO> warehouseMap,
+                                   Map<Long, WarehouseAreaDO> areaMap) {
+        item.setWarehouseName(ObjectUtils.defaultIfNull(source.getWarehouseName(), item.getWarehouseName()));
+        item.setAreaName(ObjectUtils.defaultIfNull(source.getAreaName(), item.getAreaName()));
+        if (StringUtils.isBlank(item.getWarehouseName())) {
+            MapUtils.findAndThen(warehouseMap, source.getWarehouseId(), warehouse -> item.setWarehouseName(warehouse.getName()));
+        }
+        if (StringUtils.isBlank(item.getAreaName())) {
+            MapUtils.findAndThen(areaMap, source.getAreaId(), area -> item.setAreaName(area.getAreaName()));
+        }
+    }
+
     @PostMapping("/createMesStockIn")
     @Operation(summary = "创建生产入库单")
     @PreAuthorize("@ss.hasPermission('erp:stock-in:create')")
@@ -235,24 +302,25 @@ public class ErpStockInController {
         createReqVO.setInType(StockInTypeEnum.生产入库.getValue());
         return success(stockInService.createStockIn(createReqVO));
     }
+
     @GetMapping("/pageMesStockIn")
     @Operation(summary = "获得生产入库单分页")
     @PreAuthorize("@ss.hasPermission('erp:stock-in:query')")
     public CommonResult<PageResult<ErpStockInRespVO>> pageMesStockIn(@Valid ErpStockInPageReqVO pageReqVO) {
         pageReqVO.setInType(StockInTypeEnum.生产入库.getValue());
-        PageResult<ErpStockInDO> pageResult = stockInService.getStockInPage(pageReqVO);
-        return success(buildStockInVOPageResult(pageResult));
+        fillPageReqDefault(pageReqVO);
+        return success(buildStockInVOPageResult(stockInService.getStockInPage(pageReqVO)));
     }
+
     @GetMapping("/pageComponent")
     @Operation(summary = "获得备件入库单分页")
     @PreAuthorize("@ss.hasPermission('erp:stock-in:query')")
     public CommonResult<PageResult<ErpStockInRespVO>> pageComponent(@Valid ErpStockInPageReqVO pageReqVO) {
         pageReqVO.setInType(StockInTypeEnum.生产入库.getValue());
-        PageResult<ErpStockInDO> pageResult = stockInService.getStockInPage(pageReqVO);
-        return success(buildStockInVOPageResult(pageResult));
+        fillPageReqDefault(pageReqVO);
+        return success(buildStockInVOPageResult(stockInService.getStockInPage(pageReqVO)));
     }
 
-
     @PutMapping("/update-mold-status")
     @Operation(summary = "更新模具入库单的状态")
     @PreAuthorize("@ss.hasPermission('erp:stock-out:update-status')")

yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/vo/in/ErpStockInApproveRecordRespVO.java

@@ -0,0 +1,44 @@
+package cn.iocoder.yudao.module.erp.controller.admin.stock.vo.in;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Schema(description = "管理后台 - ERP 其它入库单审核记录 Response VO")
+@Data
+public class ErpStockInApproveRecordRespVO {
+
+    @Schema(description = "编号", example = "1")
+    private Long id;
+
+    @Schema(description = "入库单编号", example = "1")
+    private Long stockInId;
+
+    @Schema(description = "操作类型", example = "SUBMIT")
+    private String actionType;
+
+    @Schema(description = "变更前状态", example = "0")
+    private Integer fromStatus;
+
+    @Schema(description = "变更后状态", example = "10")
+    private Integer toStatus;
+
+    @Schema(description = "目标审核人编号", example = "1")
+    private Long targetUserId;
+
+    @Schema(description = "目标审核人名称", example = "李四")
+    private String targetUserName;
+
+    @Schema(description = "备注", example = "请审核")
+    private String remark;
+
+    @Schema(description = "操作人", example = "1")
+    private String creator;
+
+    @Schema(description = "操作人名称", example = "张三")
+    private String creatorName;
+
+    @Schema(description = "创建时间")
+    private LocalDateTime createTime;
+}

yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/vo/in/ErpStockInAuditReqVO.java

@@ -0,0 +1,22 @@
+package cn.iocoder.yudao.module.erp.controller.admin.stock.vo.in;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+@Schema(description = "管理后台 - ERP 其它入库单审核 Request VO")
+@Data
+public class ErpStockInAuditReqVO {
+
+    @Schema(description = "入库编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "11756")
+    @NotNull(message = "入库编号不能为空")
+    private Long id;
+
+    @Schema(description = "审核结果 20-通过 1-驳回", requiredMode = Schema.RequiredMode.REQUIRED, example = "20")
+    @NotNull(message = "审核结果不能为空")
+    private Integer status;
+
+    @Schema(description = "审核备注", example = "审核通过")
+    private String remark;
+}

yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/vo/in/ErpStockInPageReqVO.java

@@ -34,23 +34,33 @@ public class ErpStockInPageReqVO extends PageParam {
     @InEnum(ErpAuditStatus.class)
     private Integer status;
 
-    @Schema(description = "入库类型", example = "随便")
+    @Schema(description = "入库类型", example = "其它入库")
     private String inType;
-    @Schema(description = "入库类型", example = "随便")
+
+    @Schema(description = "入库类型集合")
     private List<String> inTypeList;
 
     @Schema(description = "备注", example = "随便")
     private String remark;
 
-    @Schema(description = "创建者")
+    @Schema(description = "创建人")
     private String creator;
 
+    @Schema(description = "审核人编号", example = "1")
+    private Long auditUserId;
+
+    @Schema(description = "仅看当前登录人提交和待审批的数据", example = "true")
+    private Boolean relatedToMe;
+
+    @Schema(hidden = true)
+    private Long currentUserId;
+
     @Schema(description = "产品编号", example = "1")
     private Long productId;
 
     @Schema(description = "仓库编号", example = "1")
     private Long warehouseId;
 
-    @Schema(description = "id集合导出用")
+    @Schema(description = "id 集合，导出使用")
     private String ids;
-}
+}

yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/vo/in/ErpStockInRespVO.java

@@ -1,8 +1,8 @@
 package cn.iocoder.yudao.module.erp.controller.admin.stock.vo.in;
 
 import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
-import cn.iocoder.yudao.module.common.dal.dataobject.mold.MoldDO;
 import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
+import cn.iocoder.yudao.module.common.dal.dataobject.mold.MoldDO;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -29,6 +29,7 @@ public class ErpStockInRespVO {
 
     @Schema(description = "供应商编号", example = "3113")
     private Long supplierId;
+
     @Schema(description = "供应商名称", example = "芋道")
     @ExcelProperty("供应商名称")
     private String supplierName;
@@ -37,11 +38,26 @@ public class ErpStockInRespVO {
     @ExcelProperty("入库时间")
     private LocalDateTime inTime;
 
+    @Schema(description = "经办人编号", example = "1888")
+    private Long stockUserId;
+
+    @Schema(description = "经办人名称", example = "张三")
+    private String stockUserName;
+
+    @Schema(description = "是否需要审核", example = "true")
+    private Boolean needAudit;
+
+    @Schema(description = "审核人编号", example = "1888")
+    private Long auditUserId;
+
+    @Schema(description = "审核人名称", example = "李四")
+    private String auditUserName;
+
     @Schema(description = "合计数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "15663")
     @ExcelProperty("合计数量")
     private BigDecimal totalCount;
 
-    @Schema(description = "合计金额，单位：元", requiredMode = Schema.RequiredMode.REQUIRED, example = "24906")
+    @Schema(description = "合计金额", requiredMode = Schema.RequiredMode.REQUIRED, example = "24906")
     @ExcelProperty("合计金额")
     private BigDecimal totalPrice;
 
@@ -54,7 +70,7 @@ public class ErpStockInRespVO {
     @ExcelProperty("备注")
     private String remark;
 
-    @Schema(description = "入库类型", example = "随便")
+    @Schema(description = "入库类型", example = "其它入库")
     @ExcelProperty("入库类型")
     private String inType;
 
@@ -63,6 +79,7 @@ public class ErpStockInRespVO {
 
     @Schema(description = "创建人", example = "芋道")
     private String creator;
+
     @Schema(description = "创建人名称", example = "芋道")
     private String creatorName;
 
@@ -80,6 +97,9 @@ public class ErpStockInRespVO {
     @Schema(description = "模具组名称")
     private String moldSetNames;
 
+    @Schema(description = "审核记录")
+    private List<ErpStockInApproveRecordRespVO> approveRecords;
+
     @Data
     public static class Item {
 
@@ -95,33 +115,49 @@ public class ErpStockInRespVO {
         @Schema(description = "仓库编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "3113")
         private Long warehouseId;
 
+        @Schema(description = "库区编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "3113")
+        private Long areaId;
+
         @Schema(description = "产品编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "3113")
         private Long productId;
 
-        @Schema(description = "产品单价", requiredMode = Schema.RequiredMode.REQUIRED, example = "100.00")
+        @Schema(description = "产品单价", example = "100.00")
         private BigDecimal productPrice;
 
         @Schema(description = "产品数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "100.00")
         private BigDecimal count;
 
+        @Schema(description = "包装方案 ID", example = "1")
+        private Long packagingSchemeId;
+
+        @Schema(description = "单位输入方式", example = "包")
+        private String inputUnitType;
+
+        @Schema(description = "录入数量", example = "10.00")
+        private BigDecimal inputCount;
+
         @Schema(description = "备注", example = "随便")
         private String remark;
 
-        // ========== 关联字段 ==========
-
-        @Schema(description = "产品名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "巧克力")
+        @Schema(description = "产品名称", example = "巧克力")
         private String productName;
-        @Schema(description = "产品条码", requiredMode = Schema.RequiredMode.REQUIRED, example = "A9985")
+
+        @Schema(description = "产品条码", example = "A9985")
         private String productBarCode;
-        @Schema(description = "产品单位名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "盒")
+
+        @Schema(description = "产品单位名称", example = "盒")
         private String productUnitName;
 
-        @Schema(description = "库存数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "100.00")
+        @Schema(description = "仓库名称", example = "A仓")
+        private String warehouseName;
+
+        @Schema(description = "库区名称", example = "A-01")
+        private String areaName;
+
+        @Schema(description = "库存数量", example = "100.00")
         private BigDecimal stockCount;
 
         @Schema(description = "子模具详情")
         private List<MoldDO> moldList;
-
     }
-
 }

yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/vo/in/ErpStockInSaveReqVO.java

@@ -1,6 +1,5 @@
 package cn.iocoder.yudao.module.erp.controller.admin.stock.vo.in;
 
-import cn.iocoder.yudao.module.erp.dal.dataobject.product.ErpProductDO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -15,7 +14,7 @@ import java.util.List;
 @Data
 public class ErpStockInSaveReqVO {
 
-    @Schema(description = "入库编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "11756")
+    @Schema(description = "入库编号", example = "11756")
     private Long id;
 
     @Schema(description = "供应商编号", example = "3113")
@@ -25,9 +24,18 @@ public class ErpStockInSaveReqVO {
     @NotNull(message = "入库时间不能为空")
     private LocalDateTime inTime;
 
-    @Schema(description = "入库类型", example = "随便")
+    @Schema(description = "入库类型", example = "其它入库")
     private String inType;
 
+    @Schema(description = "经办人编号", example = "1888")
+    private Long stockUserId;
+
+    @Schema(description = "是否需要审核", example = "true")
+    private Boolean needAudit;
+
+    @Schema(description = "审核人编号", example = "1888")
+    private Long auditUserId;
+
     @Schema(description = "备注", example = "随便")
     private String remark;
 
@@ -39,25 +47,26 @@ public class ErpStockInSaveReqVO {
     @Valid
     private List<Item> items;
 
-
     @Schema(description = "仓库编号", example = "3113")
     private Long warehouseId;
 
-
     @Data
     public static class Item {
 
-        @Schema(description = "????????????????", example = "11756")
+        @Schema(description = "子项 id", example = "11756")
         private Long id;
 
-        @Schema(description = "??? ID?????????", example = "101")
+        @Schema(description = "模具组 id", example = "101")
         private Long moldSetId;
 
-        @Schema(description = "仓库编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "3113")
-//        @NotNull(message = "仓库编号不能为空")
+        @Schema(description = "仓库编号", example = "3113")
         private Long warehouseId;
 
-        @Schema(description = "产品编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "3113")
+        @Schema(description = "库区编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "3113")
+        @NotNull(message = "库区编号不能为空")
+        private Long areaId;
+
+        @Schema(description = "产品编号", example = "3113")
         private Long productId;
 
         @Schema(description = "产品单价", example = "100.00")
@@ -67,11 +76,19 @@ public class ErpStockInSaveReqVO {
         @NotNull(message = "产品数量不能为空")
         private BigDecimal count;
 
+        @Schema(description = "包装方案 ID", example = "1")
+        private Long packagingSchemeId;
+
+        @Schema(description = "单位输入方式", example = "包")
+        private String inputUnitType;
+
+        @Schema(description = "录入数量", example = "10.00")
+        private BigDecimal inputCount;
+
         @Schema(description = "备注", example = "随便")
         private String remark;
 
-        @Schema(description = "设备id", example = "100.00")
+        @Schema(description = "设备 id", example = "100")
         private Long deviceId;
     }
-
 }

yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/vo/in/ErpStockInSubmitReqVO.java

@@ -0,0 +1,21 @@
+package cn.iocoder.yudao.module.erp.controller.admin.stock.vo.in;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+@Schema(description = "管理后台 - ERP 其它入库单提交审核 Request VO")
+@Data
+public class ErpStockInSubmitReqVO {
+
+    @Schema(description = "入库编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "11756")
+    @NotNull(message = "入库编号不能为空")
+    private Long id;
+
+    @Schema(description = "审核人编号", example = "1888")
+    private Long auditUserId;
+
+    @Schema(description = "提交备注", example = "请审核")
+    private String remark;
+}

yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/product/ErpPackagingSchemeDO.java

@@ -0,0 +1,46 @@
+package cn.iocoder.yudao.module.erp.dal.dataobject.product;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import java.math.BigDecimal;
+
+/**
+ * ERP 包装方案 DO
+ */
+@TableName("erp_packaging_scheme")
+@KeySequence("erp_packaging_scheme_seq")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ErpPackagingSchemeDO extends BaseDO {
+
+    @TableId
+    private Long id;
+
+    private String code;
+
+    private String name;
+
+    private BigDecimal packageQuantity;
+
+    private BigDecimal palletPackageQuantity;
+
+    private BigDecimal palletTotalQuantity;
+
+    private String remark;
+
+    private Integer status;
+
+}

yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/product/ErpProductDO.java

@@ -105,9 +105,44 @@ public class ErpProductDO extends BaseDO {
      */
     private BigDecimal safetyNumber;
 
+    /**
+     * 默认仓库编号
+     */
+    private Long defaultWarehouseId;
+
+    /**
+     * 默认仓库名称
+     */
+    private String defaultWarehouseName;
+
+    /**
+     * 是否易损件
+     */
+    private Integer fragileFlag;
+
+    /**
+     * 采购周期（天）
+     */
+    private Integer purchaseCycle;
+
+    /**
+     * 备件等级
+     */
+    private String sparePartLevel;
+
+    /**
+     * 品牌
+     */
+    private String brand;
+
+    /**
+     * 型号
+     */
+    private String model;
+
     /**
      * 二维码
      */
     @TableField(exist = false)
     private String qrcodeUrl;
-}
+}

yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/productpackagingschemerel/ProductPackagingSchemeRelDO.java

@@ -0,0 +1,47 @@
+package cn.iocoder.yudao.module.erp.dal.dataobject.productpackagingschemerel;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import java.math.BigDecimal;
+
+@TableName("erp_product_packaging_scheme_rel")
+@KeySequence("erp_product_packaging_scheme_rel_seq")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ProductPackagingSchemeRelDO extends BaseDO {
+
+    @TableId
+    private Long id;
+
+    private Long productId;
+
+    private Long packagingSchemeId;
+
+    private String packagingSchemeName;
+
+    private BigDecimal packageQuantity;
+
+    private BigDecimal palletPackageQuantity;
+
+    private BigDecimal palletTotalQuantity;
+
+    private Integer defaultStatus;
+
+    private Integer sort;
+
+    private String remark;
+
+}

yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/productsupplierrel/ProductSupplierRelDO.java

@@ -0,0 +1,39 @@
+package cn.iocoder.yudao.module.erp.dal.dataobject.productsupplierrel;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+@TableName("erp_product_supplier_rel")
+@KeySequence("erp_product_supplier_rel_seq")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ProductSupplierRelDO extends BaseDO {
+
+    @TableId
+    private Long id;
+
+    private Long productId;
+
+    private Long supplierId;
+
+    private String supplierName;
+
+    private Integer defaultStatus;
+
+    private Integer sort;
+
+    private String remark;
+
+}

yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/stock/ErpStockInApproveRecordDO.java

@@ -0,0 +1,39 @@
+package cn.iocoder.yudao.module.erp.dal.dataobject.stock;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+@TableName("erp_stock_in_approve_record")
+@KeySequence("erp_stock_in_approve_record_seq")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ErpStockInApproveRecordDO extends BaseDO {
+
+    @TableId
+    private Long id;
+
+    private Long stockInId;
+
+    private String actionType;
+
+    private Integer fromStatus;
+
+    private Integer toStatus;
+
+    private Long targetUserId;
+
+    private String remark;
+
+}

yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/stock/ErpStockInDO.java

@@ -44,6 +44,10 @@ public class ErpStockInDO extends BaseDO {
      * 入库时间
      */
     private LocalDateTime inTime;
+    /**
+     * 经办人编号
+     */
+    private Long stockUserId;
     /**
      * 合计数量
      */
@@ -58,6 +62,14 @@ public class ErpStockInDO extends BaseDO {
      * 枚举 {@link cn.iocoder.yudao.module.erp.enums.ErpAuditStatus}
      */
     private Integer status;
+    /**
+     * 是否需要审核
+     */
+    private Boolean needAudit;
+    /**
+     * 审核人编号
+     */
+    private Long auditUserId;
     /**
      * 备注
      */
@@ -71,4 +83,4 @@ public class ErpStockInDO extends BaseDO {
      */
     private String fileUrl;
 
-}
+}

yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/stock/ErpStockInItemDO.java

@@ -43,6 +43,9 @@ public class ErpStockInItemDO extends BaseDO {
      * 关联 {@link ErpWarehouseDO#getId()}
      */
     private Long warehouseId;
+    private String warehouseName;
+    private Long areaId;
+    private String areaName;
     /**
      * 产品编号
      *
@@ -63,6 +66,18 @@ public class ErpStockInItemDO extends BaseDO {
      * 产品数量
      */
     private BigDecimal count;
+    /**
+     * 包装方案 ID
+     */
+    private Long packagingSchemeId;
+    /**
+     * 单位输入方式（托/包/个）
+     */
+    private String inputUnitType;
+    /**
+     * 录入数量
+     */
+    private BigDecimal inputCount;
     /**
      * 合计金额，单位：元
      */

yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/product/ErpPackagingSchemeMapper.java

@@ -0,0 +1,36 @@
+package cn.iocoder.yudao.module.erp.dal.mysql.product;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.erp.controller.admin.product.vo.packagingscheme.ErpPackagingSchemePageReqVO;
+import cn.iocoder.yudao.module.erp.dal.dataobject.product.ErpPackagingSchemeDO;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface ErpPackagingSchemeMapper extends BaseMapperX<ErpPackagingSchemeDO> {
+
+    default PageResult<ErpPackagingSchemeDO> selectPage(ErpPackagingSchemePageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<ErpPackagingSchemeDO>()
+                .likeIfPresent(ErpPackagingSchemeDO::getCode, reqVO.getCode())
+                .likeIfPresent(ErpPackagingSchemeDO::getName, reqVO.getName())
+                .eqIfPresent(ErpPackagingSchemeDO::getStatus, reqVO.getStatus())
+                .betweenIfPresent(ErpPackagingSchemeDO::getCreateTime, reqVO.getCreateTime())
+                .orderByDesc(ErpPackagingSchemeDO::getId));
+    }
+
+    default ErpPackagingSchemeDO selectByCode(String code) {
+        return selectOne(ErpPackagingSchemeDO::getCode, code);
+    }
+
+    default ErpPackagingSchemeDO selectByName(String name) {
+        return selectOne(ErpPackagingSchemeDO::getName, name);
+    }
+
+    default List<ErpPackagingSchemeDO> selectListByStatus(Integer status) {
+        return selectList(ErpPackagingSchemeDO::getStatus, status);
+    }
+
+}

yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/productpackagingschemerel/ProductPackagingSchemeRelMapper.java

@@ -0,0 +1,16 @@
+package cn.iocoder.yudao.module.erp.dal.mysql.productpackagingschemerel;
+
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.module.erp.dal.dataobject.productpackagingschemerel.ProductPackagingSchemeRelDO;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface ProductPackagingSchemeRelMapper extends BaseMapperX<ProductPackagingSchemeRelDO> {
+
+    default List<ProductPackagingSchemeRelDO> selectListByProductId(Long productId) {
+        return selectList(ProductPackagingSchemeRelDO::getProductId, productId);
+    }
+
+}

yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/productsupplierrel/ProductSupplierRelMapper.java

@@ -0,0 +1,16 @@
+package cn.iocoder.yudao.module.erp.dal.mysql.productsupplierrel;
+
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.module.erp.dal.dataobject.productsupplierrel.ProductSupplierRelDO;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface ProductSupplierRelMapper extends BaseMapperX<ProductSupplierRelDO> {
+
+    default List<ProductSupplierRelDO> selectListByProductId(Long productId) {
+        return selectList(ProductSupplierRelDO::getProductId, productId);
+    }
+
+}

yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/stock/ErpStockInApproveRecordMapper.java

@@ -0,0 +1,23 @@
+package cn.iocoder.yudao.module.erp.dal.mysql.stock;
+
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.erp.dal.dataobject.stock.ErpStockInApproveRecordDO;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface ErpStockInApproveRecordMapper extends BaseMapperX<ErpStockInApproveRecordDO> {
+
+    default List<ErpStockInApproveRecordDO> selectListByStockInId(Long stockInId) {
+        return selectList(new LambdaQueryWrapperX<ErpStockInApproveRecordDO>()
+                .eq(ErpStockInApproveRecordDO::getStockInId, stockInId)
+                .orderByAsc(ErpStockInApproveRecordDO::getId));
+    }
+
+    default int deleteByStockInId(Long stockInId) {
+        return delete(ErpStockInApproveRecordDO::getStockInId, stockInId);
+    }
+
+}

yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/stock/ErpStockInMapper.java

@@ -14,11 +14,6 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 
-/**
- * ERP 其它入库单 Mapper
- *
- * @author 芋道源码
- */
 @Mapper
 public interface ErpStockInMapper extends BaseMapperX<ErpStockInDO> {
 
@@ -32,15 +27,17 @@ public interface ErpStockInMapper extends BaseMapperX<ErpStockInDO> {
                 .inIfPresent(ErpStockInDO::getInType, reqVO.getInTypeList())
                 .likeIfPresent(ErpStockInDO::getRemark, reqVO.getRemark())
                 .eqIfPresent(ErpStockInDO::getCreator, reqVO.getCreator())
+                .eqIfPresent(ErpStockInDO::getAuditUserId, reqVO.getAuditUserId())
                 .orderByDesc(ErpStockInDO::getId);
+        query.and(Boolean.TRUE.equals(reqVO.getRelatedToMe()) && reqVO.getCurrentUserId() != null,
+                w -> w.eq(ErpStockInDO::getCreator, String.valueOf(reqVO.getCurrentUserId()))
+                        .or().eq(ErpStockInDO::getAuditUserId, reqVO.getCurrentUserId()));
         if (reqVO.getWarehouseId() != null || reqVO.getProductId() != null) {
             query.leftJoin(ErpStockInItemDO.class, ErpStockInItemDO::getInId, ErpStockInDO::getId)
                     .eq(reqVO.getWarehouseId() != null, ErpStockInItemDO::getWarehouseId, reqVO.getWarehouseId())
                     .eq(reqVO.getProductId() != null, ErpStockInItemDO::getProductId, reqVO.getProductId())
-                    .groupBy(ErpStockInDO::getId); // 避免 1 对多查询，产生相同的 1
+                    .groupBy(ErpStockInDO::getId);
         }
-
-        // 单独处理 ids 条件
         if (StringUtils.isNotBlank(reqVO.getIds())) {
             List<Long> idList = Arrays.stream(reqVO.getIds().split(","))
                     .map(String::trim)
@@ -48,19 +45,17 @@ public interface ErpStockInMapper extends BaseMapperX<ErpStockInDO> {
                     .collect(Collectors.toList());
             query.in(ErpStockInDO::getId, idList);
         }
-
-
-
         return selectJoinPage(reqVO, ErpStockInDO.class, query);
     }
 
     default int updateByIdAndStatus(Long id, Integer status, ErpStockInDO updateObj) {
         return update(updateObj, new LambdaUpdateWrapper<ErpStockInDO>()
-                .eq(ErpStockInDO::getId, id).eq(ErpStockInDO::getStatus, status));
+                .eq(ErpStockInDO::getId, id)
+                .eq(ErpStockInDO::getStatus, status));
     }
 
     default ErpStockInDO selectByNo(String no) {
         return selectOne(ErpStockInDO::getNo, no);
     }
 
-}
+}

yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/product/ErpPackagingSchemeService.java

@@ -0,0 +1,28 @@
+package cn.iocoder.yudao.module.erp.service.product;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.erp.controller.admin.product.vo.packagingscheme.ErpPackagingSchemePageReqVO;
+import cn.iocoder.yudao.module.erp.controller.admin.product.vo.packagingscheme.ErpPackagingSchemeSaveReqVO;
+import cn.iocoder.yudao.module.erp.dal.dataobject.product.ErpPackagingSchemeDO;
+
+import javax.validation.Valid;
+import java.util.Collection;
+import java.util.List;
+
+public interface ErpPackagingSchemeService {
+
+    Long createPackagingScheme(@Valid ErpPackagingSchemeSaveReqVO createReqVO);
+
+    void updatePackagingScheme(@Valid ErpPackagingSchemeSaveReqVO updateReqVO);
+
+    void deletePackagingScheme(Long id);
+
+    ErpPackagingSchemeDO getPackagingScheme(Long id);
+
+    PageResult<ErpPackagingSchemeDO> getPackagingSchemePage(ErpPackagingSchemePageReqVO pageReqVO);
+
+    List<ErpPackagingSchemeDO> getPackagingSchemeListByStatus(Integer status);
+
+    List<ErpPackagingSchemeDO> validatePackagingSchemeList(Collection<Long> ids);
+
+}

yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/product/ErpPackagingSchemeServiceImpl.java

@@ -0,0 +1,149 @@
+package cn.iocoder.yudao.module.erp.service.product;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.erp.controller.admin.autocode.util.AutoCodeUtil;
+import cn.iocoder.yudao.module.erp.controller.admin.product.vo.packagingscheme.ErpPackagingSchemePageReqVO;
+import cn.iocoder.yudao.module.erp.controller.admin.product.vo.packagingscheme.ErpPackagingSchemeSaveReqVO;
+import cn.iocoder.yudao.module.erp.dal.dataobject.product.ErpPackagingSchemeDO;
+import cn.iocoder.yudao.module.erp.dal.mysql.product.ErpPackagingSchemeMapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap;
+import static cn.iocoder.yudao.module.erp.enums.ErrorCodeConstants.PACKAGING_SCHEME_CODE_DUPLICATE;
+import static cn.iocoder.yudao.module.erp.enums.ErrorCodeConstants.PACKAGING_SCHEME_NAME_DUPLICATE;
+import static cn.iocoder.yudao.module.erp.enums.ErrorCodeConstants.PACKAGING_SCHEME_NOT_EXISTS;
+
+@Service
+@Validated
+public class ErpPackagingSchemeServiceImpl implements ErpPackagingSchemeService {
+
+    @Resource
+    private ErpPackagingSchemeMapper packagingSchemeMapper;
+
+    @Autowired
+    private AutoCodeUtil autoCodeUtil;
+
+    @Override
+    public Long createPackagingScheme(ErpPackagingSchemeSaveReqVO createReqVO) {
+        validatePackagingSchemeNameUnique(null, createReqVO.getName());
+        String code = createReqVO.getCode();
+        if (StringUtils.isBlank(code)) {
+            code = autoCodeUtil.genSerialCode("PACKAGING_SCHEME_CODE_GENERATE", null);
+        } else {
+            validatePackagingSchemeCodeUnique(null, code);
+        }
+        ErpPackagingSchemeDO packagingScheme = BeanUtils.toBean(createReqVO, ErpPackagingSchemeDO.class);
+        packagingScheme.setCode(code);
+        packagingScheme.setPalletTotalQuantity(calculatePalletTotalQuantity(
+                createReqVO.getPackageQuantity(), createReqVO.getPalletPackageQuantity(), createReqVO.getPalletTotalQuantity()));
+        packagingSchemeMapper.insert(packagingScheme);
+        return packagingScheme.getId();
+    }
+
+    @Override
+    public void updatePackagingScheme(ErpPackagingSchemeSaveReqVO updateReqVO) {
+        ErpPackagingSchemeDO dbScheme = getRequiredPackagingScheme(updateReqVO.getId());
+        validatePackagingSchemeNameUnique(updateReqVO.getId(), updateReqVO.getName());
+        String code = StringUtils.isBlank(updateReqVO.getCode()) ? dbScheme.getCode() : updateReqVO.getCode();
+        validatePackagingSchemeCodeUnique(updateReqVO.getId(), code);
+        ErpPackagingSchemeDO updateObj = BeanUtils.toBean(updateReqVO, ErpPackagingSchemeDO.class);
+        updateObj.setCode(code);
+        updateObj.setPalletTotalQuantity(calculatePalletTotalQuantity(
+                updateReqVO.getPackageQuantity(), updateReqVO.getPalletPackageQuantity(), updateReqVO.getPalletTotalQuantity()));
+        packagingSchemeMapper.updateById(updateObj);
+    }
+
+    @Override
+    public void deletePackagingScheme(Long id) {
+        validatePackagingSchemeExists(id);
+        packagingSchemeMapper.deleteById(id);
+    }
+
+    private void validatePackagingSchemeExists(Long id) {
+        if (packagingSchemeMapper.selectById(id) == null) {
+            throw exception(PACKAGING_SCHEME_NOT_EXISTS);
+        }
+    }
+
+    private ErpPackagingSchemeDO getRequiredPackagingScheme(Long id) {
+        ErpPackagingSchemeDO scheme = packagingSchemeMapper.selectById(id);
+        if (scheme == null) {
+            throw exception(PACKAGING_SCHEME_NOT_EXISTS);
+        }
+        return scheme;
+    }
+
+    private void validatePackagingSchemeNameUnique(Long id, String name) {
+        ErpPackagingSchemeDO scheme = packagingSchemeMapper.selectByName(name);
+        if (scheme == null) {
+            return;
+        }
+        if (id == null || !scheme.getId().equals(id)) {
+            throw exception(PACKAGING_SCHEME_NAME_DUPLICATE);
+        }
+    }
+
+    private void validatePackagingSchemeCodeUnique(Long id, String code) {
+        if (StringUtils.isBlank(code)) {
+            return;
+        }
+        ErpPackagingSchemeDO scheme = packagingSchemeMapper.selectByCode(code);
+        if (scheme == null) {
+            return;
+        }
+        if (id == null || !scheme.getId().equals(id)) {
+            throw exception(PACKAGING_SCHEME_CODE_DUPLICATE);
+        }
+    }
+
+    private BigDecimal calculatePalletTotalQuantity(BigDecimal packageQuantity, BigDecimal palletPackageQuantity,
+                                                    BigDecimal palletTotalQuantity) {
+        if (packageQuantity != null && palletPackageQuantity != null) {
+            return packageQuantity.multiply(palletPackageQuantity);
+        }
+        return palletTotalQuantity;
+    }
+
+    @Override
+    public ErpPackagingSchemeDO getPackagingScheme(Long id) {
+        return packagingSchemeMapper.selectById(id);
+    }
+
+    @Override
+    public PageResult<ErpPackagingSchemeDO> getPackagingSchemePage(ErpPackagingSchemePageReqVO pageReqVO) {
+        return packagingSchemeMapper.selectPage(pageReqVO);
+    }
+
+    @Override
+    public List<ErpPackagingSchemeDO> getPackagingSchemeListByStatus(Integer status) {
+        return packagingSchemeMapper.selectListByStatus(status);
+    }
+
+    @Override
+    public List<ErpPackagingSchemeDO> validatePackagingSchemeList(Collection<Long> ids) {
+        if (ids == null || ids.isEmpty()) {
+            return Collections.emptyList();
+        }
+        List<ErpPackagingSchemeDO> list = packagingSchemeMapper.selectBatchIds(ids);
+        Map<Long, ErpPackagingSchemeDO> schemeMap = convertMap(list, ErpPackagingSchemeDO::getId);
+        for (Long id : ids) {
+            if (!schemeMap.containsKey(id)) {
+                throw exception(PACKAGING_SCHEME_NOT_EXISTS);
+            }
+        }
+        return list;
+    }
+
+}

yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/product/ErpProductServiceImpl.java

@@ -15,17 +15,26 @@ import cn.iocoder.yudao.module.common.enums.QrcodeBizTypeEnum;
 import cn.iocoder.yudao.module.common.service.qrcordrecord.QrcodeRecordService;
 import cn.iocoder.yudao.module.erp.controller.admin.autocode.util.AutoCodeUtil;
 import cn.iocoder.yudao.module.erp.controller.admin.product.vo.product.*;
+import cn.iocoder.yudao.module.erp.dal.dataobject.product.ErpPackagingSchemeDO;
 import cn.iocoder.yudao.module.erp.dal.dataobject.product.ErpProductCategoryDO;
 import cn.iocoder.yudao.module.erp.dal.dataobject.product.ErpProductDO;
 import cn.iocoder.yudao.module.erp.dal.dataobject.product.ErpProductUnitDO;
 import cn.iocoder.yudao.module.erp.dal.dataobject.productdevicerel.ProductDeviceRelDO;
+import cn.iocoder.yudao.module.erp.dal.dataobject.productpackagingschemerel.ProductPackagingSchemeRelDO;
 import cn.iocoder.yudao.module.erp.dal.dataobject.productmoldrel.ProductMoldRelDO;
+import cn.iocoder.yudao.module.erp.dal.dataobject.productsupplierrel.ProductSupplierRelDO;
+import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpSupplierDO;
 import cn.iocoder.yudao.module.erp.dal.dataobject.stock.ErpStockDO;
+import cn.iocoder.yudao.module.erp.dal.dataobject.stock.ErpWarehouseDO;
 import cn.iocoder.yudao.module.erp.dal.mysql.product.ErpProductCategoryMapper;
 import cn.iocoder.yudao.module.erp.dal.mysql.product.ErpProductMapper;
 import cn.iocoder.yudao.module.erp.dal.mysql.productdevicerel.ProductDeviceRelMapper;
+import cn.iocoder.yudao.module.erp.dal.mysql.productpackagingschemerel.ProductPackagingSchemeRelMapper;
 import cn.iocoder.yudao.module.erp.dal.mysql.productmoldrel.ProductMoldRelMapper;
+import cn.iocoder.yudao.module.erp.dal.mysql.productsupplierrel.ProductSupplierRelMapper;
 import cn.iocoder.yudao.module.erp.dal.mysql.stock.ErpStockMapper;
+import cn.iocoder.yudao.module.erp.service.purchase.ErpSupplierService;
+import cn.iocoder.yudao.module.erp.service.stock.ErpWarehouseService;
 import cn.iocoder.yudao.module.erp.service.stock.ErpStockService;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -82,11 +91,26 @@ public class ErpProductServiceImpl implements ErpProductService {
     @Resource
     private ProductMoldRelMapper productMoldRelMapper;
 
+    @Resource
+    private ProductPackagingSchemeRelMapper productPackagingSchemeRelMapper;
+
+    @Resource
+    private ProductSupplierRelMapper productSupplierRelMapper;
+
 
     @Resource
     @Lazy  // 延迟注入
     private ErpStockService erpStockService;
 
+    @Resource
+    private ErpPackagingSchemeService packagingSchemeService;
+
+    @Resource
+    private ErpWarehouseService warehouseService;
+
+    @Resource
+    private ErpSupplierService supplierService;
+
     @Resource
     private QrcodeRecordService qrcodeService;
 
@@ -143,6 +167,8 @@ public class ErpProductServiceImpl implements ErpProductService {
             product.setBarCode(code);
         }
 
+        fillDefaultWarehouse(product, createReqVO.getDefaultWarehouseId());
+
         productMapper.insert(product);
 
 
@@ -180,6 +206,9 @@ public class ErpProductServiceImpl implements ErpProductService {
             productMoldRelMapper.insertBatch(relList);
         }
 
+        saveProductPackagingSchemes(product.getId(), createReqVO.getPackagingSchemes(), createReqVO.getDefaultPackagingSchemeId());
+        saveProductSuppliers(product.getId(), createReqVO.getSuppliers(), createReqVO.getDefaultSupplierId());
+
         // 生成二维码
         CodeTypeEnum codeType = autoCodeUtil.queryCodeType("PRODUCT_CODE_GENERATE");
         if (codeType==null){
@@ -218,6 +247,7 @@ public class ErpProductServiceImpl implements ErpProductService {
             updateObj.setCategoryId(id);
             id = productCategory.getParentId();
         }
+        fillDefaultWarehouse(updateObj, updateReqVO.getDefaultWarehouseId());
         productMapper.updateById(updateObj);
 
         // 先删除旧关联（推荐逻辑删；如果你们没做逻辑删，也可以物理删）
@@ -262,6 +292,14 @@ public class ErpProductServiceImpl implements ErpProductService {
             productMoldRelMapper.insertBatch(relList);
         }
 
+        productPackagingSchemeRelMapper.delete(Wrappers.<ProductPackagingSchemeRelDO>lambdaQuery()
+                .eq(ProductPackagingSchemeRelDO::getProductId, updateObj.getId()));
+        saveProductPackagingSchemes(updateObj.getId(), updateReqVO.getPackagingSchemes(), updateReqVO.getDefaultPackagingSchemeId());
+
+        productSupplierRelMapper.delete(Wrappers.<ProductSupplierRelDO>lambdaQuery()
+                .eq(ProductSupplierRelDO::getProductId, updateObj.getId()));
+        saveProductSuppliers(updateObj.getId(), updateReqVO.getSuppliers(), updateReqVO.getDefaultSupplierId());
+
     }
 
     @Override
@@ -323,6 +361,14 @@ public class ErpProductServiceImpl implements ErpProductService {
         ErpProductRespVO respVO = BeanUtils.toBean(product, ErpProductRespVO.class);
         respVO.setDevices(productMapper.selectDevicesByProductId(id));
         respVO.setMolds(productMapper.selectMoldsByProductId(id));
+        List<ProductPackagingSchemeRelDO> packagingSchemeRels = productPackagingSchemeRelMapper.selectListByProductId(id);
+        respVO.setPackagingSchemes(BeanUtils.toBean(packagingSchemeRels, ProductPackagingSchemeRespVO.class));
+        packagingSchemeRels.stream().filter(item -> Integer.valueOf(1).equals(item.getDefaultStatus())).findFirst()
+                .ifPresent(item -> respVO.setDefaultPackagingSchemeId(item.getPackagingSchemeId()));
+        List<ProductSupplierRelDO> supplierRels = productSupplierRelMapper.selectListByProductId(id);
+        respVO.setSuppliers(BeanUtils.toBean(supplierRels, ProductSupplierRespVO.class));
+        supplierRels.stream().filter(item -> Integer.valueOf(1).equals(item.getDefaultStatus())).findFirst()
+                .ifPresent(item -> respVO.setDefaultSupplierId(item.getSupplierId()));
         if (erpProductCategoryDO !=null ){
             respVO.setCategoryType(erpProductCategoryDO.getType());
         }
@@ -337,6 +383,70 @@ public class ErpProductServiceImpl implements ErpProductService {
         return respVO;
     }
 
+    private void saveProductPackagingSchemes(Long productId, List<ProductPackagingSchemeSaveReqVO> packagingSchemes,
+                                             Long defaultPackagingSchemeId) {
+        if (CollUtil.isEmpty(packagingSchemes)) {
+            return;
+        }
+        List<Long> schemeIds = packagingSchemes.stream().map(ProductPackagingSchemeSaveReqVO::getPackagingSchemeId)
+                .distinct().collect(Collectors.toList());
+        if (defaultPackagingSchemeId != null && !schemeIds.contains(defaultPackagingSchemeId)) {
+            throw exception(PACKAGING_SCHEME_NOT_EXISTS);
+        }
+        List<ErpPackagingSchemeDO> schemeList = packagingSchemeService.validatePackagingSchemeList(schemeIds);
+        Map<Long, ErpPackagingSchemeDO> schemeMap = convertMap(schemeList, ErpPackagingSchemeDO::getId);
+        List<ProductPackagingSchemeRelDO> relList = schemeIds.stream().map(schemeId -> {
+            ErpPackagingSchemeDO scheme = schemeMap.get(schemeId);
+            ProductPackagingSchemeRelDO rel = new ProductPackagingSchemeRelDO();
+            rel.setProductId(productId);
+            rel.setPackagingSchemeId(schemeId);
+            rel.setPackagingSchemeName(scheme.getName());
+            rel.setPackageQuantity(scheme.getPackageQuantity());
+            rel.setPalletPackageQuantity(scheme.getPalletPackageQuantity());
+            rel.setPalletTotalQuantity(scheme.getPalletTotalQuantity());
+            rel.setDefaultStatus(defaultPackagingSchemeId != null && defaultPackagingSchemeId.equals(schemeId) ? 1 : 0);
+            return rel;
+        }).collect(Collectors.toList());
+        productPackagingSchemeRelMapper.insertBatch(relList);
+    }
+
+    private void fillDefaultWarehouse(ErpProductDO product, Long defaultWarehouseId) {
+        if (defaultWarehouseId == null) {
+            product.setDefaultWarehouseId(null);
+            product.setDefaultWarehouseName(null);
+            return;
+        }
+        ErpWarehouseDO warehouse = warehouseService.getWarehouse(defaultWarehouseId);
+        if (warehouse == null) {
+            throw exception(WAREHOUSE_NOT_EXISTS);
+        }
+        product.setDefaultWarehouseId(warehouse.getId());
+        product.setDefaultWarehouseName(warehouse.getName());
+    }
+
+    private void saveProductSuppliers(Long productId, List<ProductSupplierSaveReqVO> suppliers, Long defaultSupplierId) {
+        if (CollUtil.isEmpty(suppliers)) {
+            return;
+        }
+        List<Long> supplierIds = suppliers.stream().map(ProductSupplierSaveReqVO::getSupplierId)
+                .distinct().collect(Collectors.toList());
+        if (defaultSupplierId != null && !supplierIds.contains(defaultSupplierId)) {
+            throw exception(SUPPLIER_NOT_EXISTS);
+        }
+        List<ErpSupplierDO> supplierList = supplierService.validSupplierList(supplierIds);
+        Map<Long, ErpSupplierDO> supplierMap = convertMap(supplierList, ErpSupplierDO::getId);
+        List<ProductSupplierRelDO> relList = supplierIds.stream().map(supplierId -> {
+            ErpSupplierDO supplier = supplierMap.get(supplierId);
+            ProductSupplierRelDO rel = new ProductSupplierRelDO();
+            rel.setProductId(productId);
+            rel.setSupplierId(supplierId);
+            rel.setSupplierName(supplier.getName());
+            rel.setDefaultStatus(defaultSupplierId != null && defaultSupplierId.equals(supplierId) ? 1 : 0);
+            return rel;
+        }).collect(Collectors.toList());
+        productSupplierRelMapper.insertBatch(relList);
+    }
+
     @Override
     public ErpProductRespVO getProduct(Long id, String code) {
         if (id != null) {

yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpSupplierService.java

@@ -66,6 +66,8 @@ public interface ErpSupplierService {
      */
     List<ErpSupplierDO> getSupplierList(Collection<Long> ids);
 
+    List<ErpSupplierDO> validSupplierList(Collection<Long> ids);
+
     /**
      * 获得供应商 Map
      *
@@ -93,4 +95,4 @@ public interface ErpSupplierService {
      */
     List<ErpSupplierDO> getSupplierListByStatus(Integer status);
 
-}
+}

yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpSupplierServiceImpl.java

@@ -12,9 +12,12 @@ import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap;
 import static cn.iocoder.yudao.module.erp.enums.ErrorCodeConstants.SUPPLIER_NOT_ENABLE;
 import static cn.iocoder.yudao.module.erp.enums.ErrorCodeConstants.SUPPLIER_NOT_EXISTS;
 
@@ -82,6 +85,25 @@ public class ErpSupplierServiceImpl implements ErpSupplierService {
         return supplierMapper.selectBatchIds(ids);
     }
 
+    @Override
+    public List<ErpSupplierDO> validSupplierList(Collection<Long> ids) {
+        if (ids == null || ids.isEmpty()) {
+            return Collections.emptyList();
+        }
+        List<ErpSupplierDO> list = supplierMapper.selectBatchIds(ids);
+        Map<Long, ErpSupplierDO> supplierMap = convertMap(list, ErpSupplierDO::getId);
+        for (Long id : ids) {
+            ErpSupplierDO supplier = supplierMap.get(id);
+            if (supplier == null) {
+                throw exception(SUPPLIER_NOT_EXISTS);
+            }
+            if (CommonStatusEnum.isDisable(supplier.getStatus())) {
+                throw exception(SUPPLIER_NOT_ENABLE, supplier.getName());
+            }
+        }
+        return list;
+    }
+
     @Override
     public PageResult<ErpSupplierDO> getSupplierPage(ErpSupplierPageReqVO pageReqVO) {
         return supplierMapper.selectPage(pageReqVO);
@@ -92,4 +114,4 @@ public class ErpSupplierServiceImpl implements ErpSupplierService {
         return supplierMapper.selectListByStatus(status);
     }
 
-}
+}

yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockInService.java

@@ -1,8 +1,11 @@
 package cn.iocoder.yudao.module.erp.service.stock;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.erp.controller.admin.stock.vo.in.ErpStockInAuditReqVO;
 import cn.iocoder.yudao.module.erp.controller.admin.stock.vo.in.ErpStockInPageReqVO;
 import cn.iocoder.yudao.module.erp.controller.admin.stock.vo.in.ErpStockInSaveReqVO;
+import cn.iocoder.yudao.module.erp.controller.admin.stock.vo.in.ErpStockInSubmitReqVO;
+import cn.iocoder.yudao.module.erp.dal.dataobject.stock.ErpStockInApproveRecordDO;
 import cn.iocoder.yudao.module.erp.dal.dataobject.stock.ErpStockInDO;
 import cn.iocoder.yudao.module.erp.dal.dataobject.stock.ErpStockInItemDO;
 
@@ -10,76 +13,29 @@ import javax.validation.Valid;
 import java.util.Collection;
 import java.util.List;
 
-/**
- * ERP 其它入库单 Service 接口
- *
- * @author 芋道源码
- */
 public interface ErpStockInService {
 
-    /**
-     * 创建其它入库单
-     *
-     * @param createReqVO 创建信息
-     * @return 编号
-     */
     Long createStockIn(@Valid ErpStockInSaveReqVO createReqVO);
 
-    /**
-     * 更新其它入库单
-     *
-     * @param updateReqVO 更新信息
-     */
     void updateStockIn(@Valid ErpStockInSaveReqVO updateReqVO);
 
-    /**
-     * 更新其它入库单的状态
-     *
-     * @param id 编号
-     * @param status 状态
-     */
-    void updateStockInStatus(Long id, Integer status,Integer bizType);
+    void updateStockInStatus(Long id, Integer status, Integer bizType);
+
+    void submitStockInAudit(@Valid ErpStockInSubmitReqVO submitReqVO);
+
+    void auditStockIn(@Valid ErpStockInAuditReqVO auditReqVO);
 
-    /**
-     * 删除其它入库单
-     *
-     * @param ids 编号数组
-     */
     void deleteStockIn(List<Long> ids);
 
-    /**
-     * 获得其它入库单
-     *
-     * @param id 编号
-     * @return 其它入库单
-     */
     ErpStockInDO getStockIn(Long id);
 
-    /**
-     * 获得其它入库单分页
-     *
-     * @param pageReqVO 分页查询
-     * @return 其它入库单分页
-     */
     PageResult<ErpStockInDO> getStockInPage(ErpStockInPageReqVO pageReqVO);
 
-    // ==================== 入库项 ====================
-
-    /**
-     * 获得其它入库单项列表
-     *
-     * @param inId 入库编号
-     * @return 其它入库单项列表
-     */
     List<ErpStockInItemDO> getStockInItemListByInId(Long inId);
 
-    /**
-     * 获得其它入库单项 List
-     *
-     * @param inIds 入库编号数组
-     * @return 其它入库单项 List
-     */
     List<ErpStockInItemDO> getStockInItemListByInIds(Collection<Long> inIds);
 
+    List<ErpStockInApproveRecordDO> getStockInApproveRecordList(Long stockInId);
+
     void updateMoldStatus(Long id, Integer status);
-}
+}

yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockInServiceImpl.java

@@ -3,17 +3,23 @@ package cn.iocoder.yudao.module.erp.service.stock;
 import cn.hutool.core.collection.CollUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.number.MoneyUtils;
+import cn.iocoder.yudao.framework.common.util.number.NumberUtils;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
 import cn.iocoder.yudao.module.common.controller.admin.mold.vo.MoldBrandSaveReqVO;
 import cn.iocoder.yudao.module.common.dal.dataobject.mold.MoldBrandDO;
+import cn.iocoder.yudao.module.common.enums.MoldBrandStatusEnum;
+import cn.iocoder.yudao.module.erp.controller.admin.stock.vo.in.ErpStockInAuditReqVO;
 import cn.iocoder.yudao.module.erp.controller.admin.stock.vo.in.ErpStockInPageReqVO;
 import cn.iocoder.yudao.module.erp.controller.admin.stock.vo.in.ErpStockInSaveReqVO;
-import cn.iocoder.yudao.module.erp.controller.admin.stock.vo.out.ErpStockOutSaveReqVO;
+import cn.iocoder.yudao.module.erp.controller.admin.stock.vo.in.ErpStockInSubmitReqVO;
 import cn.iocoder.yudao.module.erp.dal.dataobject.product.ErpProductDO;
-import cn.iocoder.yudao.module.erp.dal.dataobject.stock.ErpStockDO;
+import cn.iocoder.yudao.module.erp.dal.dataobject.stock.ErpStockInApproveRecordDO;
 import cn.iocoder.yudao.module.erp.dal.dataobject.stock.ErpStockInDO;
 import cn.iocoder.yudao.module.erp.dal.dataobject.stock.ErpStockInItemDO;
-import cn.iocoder.yudao.module.erp.dal.dataobject.stock.ErpStockOutDO;
+import cn.iocoder.yudao.module.erp.dal.dataobject.stock.ErpWarehouseDO;
+import cn.iocoder.yudao.module.erp.dal.dataobject.warehousearea.WarehouseAreaDO;
+import cn.iocoder.yudao.module.erp.dal.mysql.stock.ErpStockInApproveRecordMapper;
 import cn.iocoder.yudao.module.erp.dal.mysql.stock.ErpStockInItemMapper;
 import cn.iocoder.yudao.module.erp.dal.mysql.stock.ErpStockInMapper;
 import cn.iocoder.yudao.module.erp.dal.mysql.stock.ErpStockMapper;
@@ -24,40 +30,63 @@ import cn.iocoder.yudao.module.erp.service.mold.MoldBrandService;
 import cn.iocoder.yudao.module.erp.service.product.ErpProductService;
 import cn.iocoder.yudao.module.erp.service.purchase.ErpSupplierService;
 import cn.iocoder.yudao.module.erp.service.stock.bo.ErpStockRecordCreateReqBO;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import cn.iocoder.yudao.module.erp.service.warehousearea.WarehouseAreaService;
+import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
-import java.util.*;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.*;
-import static cn.iocoder.yudao.module.erp.enums.ErrorCodeConstants.*;
-
-// TODO 芋艿：记录操作日志
-/**
- * ERP 其它入库单 Service 实现类
- *
- * @author 芋道源码
- */
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap;
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.diffList;
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.getSumValue;
+import static cn.iocoder.yudao.module.erp.enums.ErrorCodeConstants.STOCK_ALERADY_IN;
+import static cn.iocoder.yudao.module.erp.enums.ErrorCodeConstants.STOCK_IN_APPROVE_FAIL;
+import static cn.iocoder.yudao.module.erp.enums.ErrorCodeConstants.STOCK_IN_AUDIT_FAIL_RESULT;
+import static cn.iocoder.yudao.module.erp.enums.ErrorCodeConstants.STOCK_IN_AUDIT_FAIL_STATUS;
+import static cn.iocoder.yudao.module.erp.enums.ErrorCodeConstants.STOCK_IN_AUDIT_FAIL_USER;
+import static cn.iocoder.yudao.module.erp.enums.ErrorCodeConstants.STOCK_IN_DELETE_FAIL_APPROVE;
+import static cn.iocoder.yudao.module.erp.enums.ErrorCodeConstants.STOCK_IN_DELETE_FAIL_PROCESS;
+import static cn.iocoder.yudao.module.erp.enums.ErrorCodeConstants.STOCK_IN_NOT_EXISTS;
+import static cn.iocoder.yudao.module.erp.enums.ErrorCodeConstants.STOCK_IN_NO_EXISTS;
+import static cn.iocoder.yudao.module.erp.enums.ErrorCodeConstants.STOCK_IN_PROCESS_FAIL;
+import static cn.iocoder.yudao.module.erp.enums.ErrorCodeConstants.STOCK_IN_SUBMIT_FAIL_AUDIT_USER_EMPTY;
+import static cn.iocoder.yudao.module.erp.enums.ErrorCodeConstants.STOCK_IN_SUBMIT_FAIL_STATUS;
+import static cn.iocoder.yudao.module.erp.enums.ErrorCodeConstants.STOCK_IN_SUBMIT_FAIL_USER;
+import static cn.iocoder.yudao.module.erp.enums.ErrorCodeConstants.STOCK_IN_UPDATE_FAIL_APPROVE;
+import static cn.iocoder.yudao.module.erp.enums.ErrorCodeConstants.STOCK_IN_UPDATE_FAIL_PROCESS;
+import static cn.iocoder.yudao.module.erp.enums.ErrorCodeConstants.WAREHOUSE_AREA_NOT_EXISTS;
+import static cn.iocoder.yudao.module.erp.enums.ErrorCodeConstants.WAREHOUSE_LOCATION_WAREHOUSE_AREA_NOT_MATCH;
+
 @Service
 @Validated
 public class ErpStockInServiceImpl implements ErpStockInService {
 
+    private static final String ACTION_SUBMIT = "SUBMIT";
+    private static final String ACTION_APPROVE = "APPROVE";
+    private static final String ACTION_REJECT = "REJECT";
+    private static final String ACTION_AUTO_APPROVE = "AUTO_APPROVE";
+
     @Resource
     private ErpStockInMapper stockInMapper;
     @Resource
     private ErpStockInItemMapper stockInItemMapper;
-
+    @Resource
+    private ErpStockInApproveRecordMapper stockInApproveRecordMapper;
     @Resource
     private ErpStockMapper erpStockMapper;
-
     @Resource
     private ErpNoRedisDAO noRedisDAO;
-
     @Resource
     private ErpProductService productService;
     @Resource
@@ -68,174 +97,164 @@ public class ErpStockInServiceImpl implements ErpStockInService {
     private ErpStockRecordService stockRecordService;
     @Resource
     private MoldBrandService moldBrandService;
+    @Resource
+    private WarehouseAreaService warehouseAreaService;
+    @Resource
+    private AdminUserApi adminUserApi;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Long createStockIn(ErpStockInSaveReqVO createReqVO) {
-        // 1.1 校验入库项的有效性
-        List<ErpStockInItemDO> stockInItems = validateStockInItems(createReqVO.getItems(),createReqVO.getInType());
-        // 1.2 校验供应商
-        //supplierService.validateSupplier(createReqVO.getSupplierId());
-        // 1.3 生成入库单号，并校验唯一性
+        List<ErpStockInItemDO> stockInItems = validateStockInItems(createReqVO.getItems(), createReqVO.getInType());
+        if (createReqVO.getStockUserId() != null) {
+            adminUserApi.validateUser(createReqVO.getStockUserId());
+        }
+        if (createReqVO.getAuditUserId() != null) {
+            adminUserApi.validateUser(createReqVO.getAuditUserId());
+        }
         String no = noRedisDAO.generate(ErpNoRedisDAO.STOCK_IN_NO_PREFIX);
         if (stockInMapper.selectByNo(no) != null) {
             throw exception(STOCK_IN_NO_EXISTS);
         }
 
-        // 2.1 插入入库单
+        boolean needAudit = !Boolean.FALSE.equals(createReqVO.getNeedAudit());
+        Integer status = needAudit ? ErpAuditStatus.DRAFT.getStatus() : ErpAuditStatus.APPROVE.getStatus();
         ErpStockInDO stockIn = BeanUtils.toBean(createReqVO, ErpStockInDO.class, in -> in
-                .setNo(no).setStatus(ErpAuditStatus.PROCESS.getStatus())
+                .setNo(no)
+                .setNeedAudit(needAudit)
+                .setStatus(status)
                 .setTotalCount(getSumValue(stockInItems, ErpStockInItemDO::getCount, BigDecimal::add))
                 .setTotalPrice(getSumValue(stockInItems, ErpStockInItemDO::getTotalPrice, BigDecimal::add, BigDecimal.ZERO)));
         stockInMapper.insert(stockIn);
-        // 2.2 插入入库单项
-        stockInItems.forEach(o -> {
-            o.setInId(stockIn.getId());
-            o.setCount(o.getCount());
-        });
+        stockInItems.forEach(item -> item.setInId(stockIn.getId()));
         stockInItemMapper.insertBatch(stockInItems);
-//        for (ErpStockInItemDO  item : stockInItems) {
-//            MoldDO moldDO = moldService.getMold(item.getProductId());
-//            moldDO.setStatus(ErpAuditStatus.PROCESS.getStatus()); // 未审核
-//            moldService.updateMold(BeanUtils.toBean(moldDO, MoldSaveReqVO.class));
-//        }
+
+        if (!needAudit) {
+            applyStockInEffect(stockIn, stockInItems, null);
+            createApproveRecord(stockIn.getId(), ACTION_AUTO_APPROVE, null,
+                    ErpAuditStatus.APPROVE.getStatus(), null, "无需审核，系统自动入库");
+        }
         return stockIn.getId();
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void updateStockIn(ErpStockInSaveReqVO updateReqVO) {
-        // 1.1 校验存在
         ErpStockInDO stockIn = validateStockInExists(updateReqVO.getId());
         if (ErpAuditStatus.APPROVE.getStatus().equals(stockIn.getStatus())) {
             throw exception(STOCK_IN_UPDATE_FAIL_APPROVE, stockIn.getNo());
         }
-        // 1.2 校验供应商
-        //supplierService.validateSupplier(updateReqVO.getSupplierId());
-        // 1.3 校验入库项的有效性
-        List<ErpStockInItemDO> stockInItems = validateStockInItems(updateReqVO.getItems(),updateReqVO.getInType());
-
-        // 2.1 更新入库单
+        if (ErpAuditStatus.PROCESS.getStatus().equals(stockIn.getStatus())) {
+            throw exception(STOCK_IN_UPDATE_FAIL_PROCESS, stockIn.getNo());
+        }
+        if (updateReqVO.getStockUserId() != null) {
+            adminUserApi.validateUser(updateReqVO.getStockUserId());
+        }
+        if (updateReqVO.getAuditUserId() != null) {
+            adminUserApi.validateUser(updateReqVO.getAuditUserId());
+        }
+        List<ErpStockInItemDO> stockInItems = validateStockInItems(updateReqVO.getItems(), updateReqVO.getInType());
+        boolean needAudit = !Boolean.FALSE.equals(updateReqVO.getNeedAudit());
         ErpStockInDO updateObj = BeanUtils.toBean(updateReqVO, ErpStockInDO.class, in -> in
+                .setNeedAudit(needAudit)
                 .setTotalCount(getSumValue(stockInItems, ErpStockInItemDO::getCount, BigDecimal::add))
-                .setTotalPrice(getSumValue(stockInItems, ErpStockInItemDO::getTotalPrice, BigDecimal::add)));
+                .setTotalPrice(getSumValue(stockInItems, ErpStockInItemDO::getTotalPrice, BigDecimal::add, BigDecimal.ZERO)));
         stockInMapper.updateById(updateObj);
-        // 2.2 更新入库单项
         updateStockInItemList(updateReqVO.getId(), stockInItems);
-
-
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void updateStockInStatus(Long id, Integer status,Integer bizType) {
-        boolean approve = ErpAuditStatus.APPROVE.getStatus().equals(status);
+    public void updateStockInStatus(Long id, Integer status, Integer bizType) {
         ErpStockInDO stockIn = validateStockInExists(id);
-        if (stockIn.getStatus().equals(status)) {
-            throw exception(approve ? STOCK_IN_APPROVE_FAIL : STOCK_IN_PROCESS_FAIL);
+        boolean approve = ErpAuditStatus.APPROVE.getStatus().equals(status);
+        if (approve) {
+            if (!ErpAuditStatus.PROCESS.getStatus().equals(stockIn.getStatus())) {
+                throw exception(STOCK_IN_APPROVE_FAIL);
+            }
+        } else {
+            if (!ErpAuditStatus.APPROVE.getStatus().equals(stockIn.getStatus())) {
+                throw exception(STOCK_IN_PROCESS_FAIL);
+            }
         }
-
-        int updateCount = stockInMapper.updateByIdAndStatus(id, stockIn.getStatus(),
-                new ErpStockInDO().setStatus(status));
+        int updateCount = stockInMapper.updateByIdAndStatus(id, stockIn.getStatus(), new ErpStockInDO().setStatus(status));
         if (updateCount == 0) {
             throw exception(approve ? STOCK_IN_APPROVE_FAIL : STOCK_IN_PROCESS_FAIL);
         }
-
         List<ErpStockInItemDO> stockInItems = stockInItemMapper.selectListByInId(id);
-        stockInItems.forEach(stockInItem -> {
-            BigDecimal count = approve ? stockInItem.getCount() : stockInItem.getCount().negate();
-            if (Objects.equals(stockIn.getInType(), "模具入库")) {
-                MoldBrandDO moldDO = moldBrandService.getMoldBrand(stockInItem.getMoldSetId());
-                stockRecordService.createStockRecord(new ErpStockRecordCreateReqBO(
-                        stockInItem.getProductId(), moldDO.getId(), stockInItem.getWarehouseId(), count,
-                        ErpStockRecordBizTypeEnum.OTHER_IN.getType(), stockInItem.getInId(), stockInItem.getId(), stockIn.getNo(), stockIn.getInTime()));
-            } else {
-                ErpProductDO productDO = productService.getProduct(stockInItem.getProductId());
-                stockRecordService.createStockRecord(new ErpStockRecordCreateReqBO(
-                        stockInItem.getProductId(), productDO.getCategoryId(), stockInItem.getWarehouseId(), count,
-                        ErpStockRecordBizTypeEnum.getTypeByName(stockIn.getInType(), status), stockInItem.getInId(), stockInItem.getId(), stockIn.getNo(), stockIn.getInTime()));
-            }
-        });
-
-        if (Objects.equals(stockIn.getInType(), "模具入库")) {
-            for (ErpStockInItemDO item : stockInItems) {
-                if (item.getMoldSetId() != null) {
-                    MoldBrandDO moldDO = moldBrandService.getMoldBrand(item.getMoldSetId());
-                    if (Objects.equals(moldDO.getStatus(), 1)) {
-                        throw exception(STOCK_ALERADY_IN, moldDO.getCode() + "-" + moldDO.getName());
-                    }
-                    moldDO.setStatus(1);
-                    moldBrandService.updateMoldBrand(BeanUtils.toBean(moldDO, MoldBrandSaveReqVO.class));
-                }
-            }
+        if (approve) {
+            applyStockInEffect(stockIn, stockInItems, bizType);
+        } else {
+            cancelStockInEffect(stockIn, stockInItems, bizType);
         }
     }
 
-    private List<ErpStockInItemDO> validateStockInItems(List<ErpStockInSaveReqVO.Item> list,String outType) {
-        if (Objects.equals(outType, "模具入库")) {
-            List<MoldBrandDO> moldList = moldBrandService.validMoldList(
-                    convertSet(list, ErpStockInSaveReqVO.Item::getMoldSetId));
-            Map<Long, MoldBrandDO> moldMap = convertMap(moldList, MoldBrandDO::getId);
-            return convertList(list, o -> {
-                MoldBrandDO moldBrand = moldMap.get(o.getMoldSetId());
-                return ErpStockInItemDO.builder()
-                        .id(null)
-                        .moldSetId(moldBrand.getId())
-                        .moldSetName(moldBrand.getName())
-                        .warehouseId(o.getWarehouseId())
-                        .productId(moldBrand.getId())
-                        .productUnitId(null)
-                        .productPrice(o.getProductPrice())
-                        .count(o.getCount())
-                        .totalPrice(MoneyUtils.priceMultiply(o.getProductPrice(), o.getCount()))
-                        .remark(o.getRemark())
-                        .deviceId(o.getDeviceId())
-                        .build();
-            });
-        } else {
-            List<ErpProductDO> productList = productService.validProductList(
-                    convertSet(list, ErpStockInSaveReqVO.Item::getProductId));
-            Map<Long, ErpProductDO> productMap = convertMap(productList, ErpProductDO::getId);
-            warehouseService.validWarehouseList(convertSet(
-                    list, ErpStockInSaveReqVO.Item::getWarehouseId));
-            return convertList(list, o -> BeanUtils.toBean(o, ErpStockInItemDO.class, item -> item
-                    .setProductUnitId(productMap.get(item.getProductId()).getUnitId())
-                    .setTotalPrice(MoneyUtils.priceMultiply(item.getProductPrice(), item.getCount()))));
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void submitStockInAudit(ErpStockInSubmitReqVO submitReqVO) {
+        ErpStockInDO stockIn = validateStockInExists(submitReqVO.getId());
+        Long loginUserId = SecurityFrameworkUtils.getLoginUserId();
+        if (!Objects.equals(NumberUtils.parseLong(stockIn.getCreator()), loginUserId)) {
+            throw exception(STOCK_IN_SUBMIT_FAIL_USER);
+        }
+        if (!ErpAuditStatus.DRAFT.getStatus().equals(stockIn.getStatus())
+                && !ErpAuditStatus.UN_APPROVE.getStatus().equals(stockIn.getStatus())) {
+            throw exception(STOCK_IN_SUBMIT_FAIL_STATUS);
+        }
+        Long auditUserId = submitReqVO.getAuditUserId() != null ? submitReqVO.getAuditUserId() : stockIn.getAuditUserId();
+        if (auditUserId == null) {
+            throw exception(STOCK_IN_SUBMIT_FAIL_AUDIT_USER_EMPTY);
         }
+        adminUserApi.validateUser(auditUserId);
+        Integer fromStatus = stockIn.getStatus();
+        ErpStockInDO updateObj = new ErpStockInDO()
+                .setAuditUserId(auditUserId)
+                .setNeedAudit(true)
+                .setStatus(ErpAuditStatus.PROCESS.getStatus());
+        int updateCount = stockInMapper.updateByIdAndStatus(stockIn.getId(), fromStatus, updateObj);
+        if (updateCount == 0) {
+            throw exception(STOCK_IN_SUBMIT_FAIL_STATUS);
+        }
+        createApproveRecord(stockIn.getId(), ACTION_SUBMIT, fromStatus,
+                ErpAuditStatus.PROCESS.getStatus(), auditUserId, submitReqVO.getRemark());
     }
 
-    private void updateStockInItemList(Long id, List<ErpStockInItemDO> newList) {
-        boolean moldStockIn = CollUtil.isNotEmpty(newList)
-                && newList.stream().anyMatch(item -> item.getMoldSetId() != null);
-        if (moldStockIn) {
-            stockInItemMapper.deleteByInId(id);
-            newList.forEach(o -> {
-                o.setId(null);
-                o.setInId(id);
-            });
-            stockInItemMapper.insertBatch(newList);
-            return;
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void auditStockIn(ErpStockInAuditReqVO auditReqVO) {
+        ErpStockInDO stockIn = validateStockInExists(auditReqVO.getId());
+        if (!ErpAuditStatus.PROCESS.getStatus().equals(stockIn.getStatus())) {
+            throw exception(STOCK_IN_AUDIT_FAIL_STATUS);
         }
-
-        List<ErpStockInItemDO> oldList = stockInItemMapper.selectListByInId(id);
-        List<List<ErpStockInItemDO>> diffList = diffList(oldList, newList,
-                (oldVal, newVal) -> oldVal.getId().equals(newVal.getId()));
-        if (CollUtil.isNotEmpty(diffList.get(0))) {
-            diffList.get(0).forEach(o -> o.setInId(id));
-            stockInItemMapper.insertBatch(diffList.get(0));
+        Long loginUserId = SecurityFrameworkUtils.getLoginUserId();
+        if (!Objects.equals(stockIn.getAuditUserId(), loginUserId)) {
+            throw exception(STOCK_IN_AUDIT_FAIL_USER);
         }
-        if (CollUtil.isNotEmpty(diffList.get(1))) {
-            stockInItemMapper.updateBatch(diffList.get(1));
+        if (!ErpAuditStatus.APPROVE.getStatus().equals(auditReqVO.getStatus())
+                && !ErpAuditStatus.UN_APPROVE.getStatus().equals(auditReqVO.getStatus())) {
+            throw exception(STOCK_IN_AUDIT_FAIL_RESULT);
         }
-        if (CollUtil.isNotEmpty(diffList.get(2))) {
-            stockInItemMapper.deleteBatchIds(convertList(diffList.get(2), ErpStockInItemDO::getId));
+
+        Integer fromStatus = stockIn.getStatus();
+        int updateCount = stockInMapper.updateByIdAndStatus(stockIn.getId(), fromStatus,
+                new ErpStockInDO().setStatus(auditReqVO.getStatus()));
+        if (updateCount == 0) {
+            throw exception(STOCK_IN_AUDIT_FAIL_STATUS);
+        }
+
+        List<ErpStockInItemDO> stockInItems = stockInItemMapper.selectListByInId(stockIn.getId());
+        if (ErpAuditStatus.APPROVE.getStatus().equals(auditReqVO.getStatus())) {
+            applyStockInEffect(stockIn, stockInItems, null);
         }
+        Long targetUserId = NumberUtils.parseLong(stockIn.getCreator());
+        createApproveRecord(stockIn.getId(), ErpAuditStatus.APPROVE.getStatus().equals(auditReqVO.getStatus())
+                        ? ACTION_APPROVE : ACTION_REJECT,
+                fromStatus, auditReqVO.getStatus(), targetUserId, auditReqVO.getRemark());
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void deleteStockIn(List<Long> ids) {
-        // 1. 校验不处于已审批
         List<ErpStockInDO> stockIns = stockInMapper.selectBatchIds(ids);
         if (CollUtil.isEmpty(stockIns)) {
             return;
@@ -244,14 +263,14 @@ public class ErpStockInServiceImpl implements ErpStockInService {
             if (ErpAuditStatus.APPROVE.getStatus().equals(stockIn.getStatus())) {
                 throw exception(STOCK_IN_DELETE_FAIL_APPROVE, stockIn.getNo());
             }
+            if (ErpAuditStatus.PROCESS.getStatus().equals(stockIn.getStatus())) {
+                throw exception(STOCK_IN_DELETE_FAIL_PROCESS, stockIn.getNo());
+            }
         });
-
-        // 2. 遍历删除，并记录操作日志
         stockIns.forEach(stockIn -> {
-            // 2.1 删除入库单
             stockInMapper.deleteById(stockIn.getId());
-            // 2.2 删除入库单项
             stockInItemMapper.deleteByInId(stockIn.getId());
+            stockInApproveRecordMapper.deleteByStockInId(stockIn.getId());
         });
     }
 
@@ -273,8 +292,6 @@ public class ErpStockInServiceImpl implements ErpStockInService {
         return stockInMapper.selectPage(pageReqVO);
     }
 
-    // ==================== 入库项 ====================
-
     @Override
     public List<ErpStockInItemDO> getStockInItemListByInId(Long inId) {
         return stockInItemMapper.selectListByInId(inId);
@@ -288,6 +305,11 @@ public class ErpStockInServiceImpl implements ErpStockInService {
         return stockInItemMapper.selectListByInIds(inIds);
     }
 
+    @Override
+    public List<ErpStockInApproveRecordDO> getStockInApproveRecordList(Long stockInId) {
+        return stockInApproveRecordMapper.selectListByStockInId(stockInId);
+    }
+
     @Override
     public void updateMoldStatus(Long id, Integer status) {
         ErpStockInDO stockIn = validateStockInExists(id);
@@ -295,4 +317,153 @@ public class ErpStockInServiceImpl implements ErpStockInService {
         stockInMapper.updateById(stockIn);
     }
 
+    private void applyStockInEffect(ErpStockInDO stockIn, List<ErpStockInItemDO> stockInItems, Integer bizType) {
+        operateStockInEffect(stockIn, stockInItems, true, bizType);
+    }
+
+    private void cancelStockInEffect(ErpStockInDO stockIn, List<ErpStockInItemDO> stockInItems, Integer bizType) {
+        operateStockInEffect(stockIn, stockInItems, false, bizType);
+    }
+
+    private void operateStockInEffect(ErpStockInDO stockIn, List<ErpStockInItemDO> stockInItems,
+                                      boolean approve, Integer bizType) {
+        stockInItems.forEach(stockInItem -> {
+            BigDecimal count = approve ? stockInItem.getCount() : stockInItem.getCount().negate();
+            if (Objects.equals(stockIn.getInType(), "妯″叿鍏ュ簱")) {
+                MoldBrandDO moldDO = moldBrandService.getMoldBrand(stockInItem.getMoldSetId());
+                Integer recordBizType = bizType != null ? bizType
+                        : (approve ? ErpStockRecordBizTypeEnum.OTHER_IN.getType()
+                        : ErpStockRecordBizTypeEnum.OTHER_IN_CANCEL.getType());
+                stockRecordService.createStockRecord(new ErpStockRecordCreateReqBO(
+                        stockInItem.getProductId(), moldDO.getId(), stockInItem.getWarehouseId(), count,
+                        recordBizType, stockInItem.getInId(), stockInItem.getId(), stockIn.getNo(), stockIn.getInTime()));
+                if (approve && itemNeedUpdateMoldStatus(moldDO)) {
+                    moldDO.setStatus(MoldBrandStatusEnum.STANDBY.getStatus());
+                    moldBrandService.updateMoldBrand(BeanUtils.toBean(moldDO, MoldBrandSaveReqVO.class));
+                }
+            } else {
+                ErpProductDO productDO = productService.getProduct(stockInItem.getProductId());
+                Integer recordBizType = bizType != null ? bizType
+                        : (approve ? ErpStockRecordBizTypeEnum.getTypeByName(stockIn.getInType())
+                        : ErpStockRecordBizTypeEnum.getTypeByName(stockIn.getInType(), 10));
+                stockRecordService.createStockRecord(new ErpStockRecordCreateReqBO(
+                        stockInItem.getProductId(), productDO.getCategoryId(), stockInItem.getWarehouseId(), count,
+                        recordBizType, stockInItem.getInId(), stockInItem.getId(), stockIn.getNo(), stockIn.getInTime()));
+            }
+        });
+    }
+
+    private boolean itemNeedUpdateMoldStatus(MoldBrandDO moldDO) {
+        if (Objects.equals(moldDO.getStatus(), MoldBrandStatusEnum.STANDBY.getStatus())) {
+            throw exception(STOCK_ALERADY_IN, moldDO.getCode() + "-" + moldDO.getName());
+        }
+        return true;
+    }
+
+    private void createApproveRecord(Long stockInId, String actionType, Integer fromStatus,
+                                     Integer toStatus, Long targetUserId, String remark) {
+        stockInApproveRecordMapper.insert(ErpStockInApproveRecordDO.builder()
+                .stockInId(stockInId)
+                .actionType(actionType)
+                .fromStatus(fromStatus)
+                .toStatus(toStatus)
+                .targetUserId(targetUserId)
+                .remark(remark)
+                .build());
+    }
+
+    private List<ErpStockInItemDO> validateStockInItems(List<ErpStockInSaveReqVO.Item> list, String inType) {
+        validateWarehouseAreas(list);
+        if (Objects.equals(inType, "妯″叿鍏ュ簱")) {
+            List<MoldBrandDO> moldList = moldBrandService.validMoldList(convertSet(list, ErpStockInSaveReqVO.Item::getMoldSetId));
+            Map<Long, MoldBrandDO> moldMap = convertMap(moldList, MoldBrandDO::getId);
+            Map<Long, ErpWarehouseDO> warehouseMap = convertMap(
+                    warehouseService.getWarehouseList(convertSet(list, ErpStockInSaveReqVO.Item::getWarehouseId)),
+                    ErpWarehouseDO::getId);
+            Map<Long, WarehouseAreaDO> areaMap = warehouseAreaService.getWarehouseAreaMap(
+                    convertSet(list, ErpStockInSaveReqVO.Item::getAreaId));
+            return convertList(list, item -> {
+                MoldBrandDO moldBrand = moldMap.get(item.getMoldSetId());
+                return ErpStockInItemDO.builder()
+                        .id(item.getId())
+                        .moldSetId(moldBrand.getId())
+                        .moldSetName(moldBrand.getName())
+                        .warehouseId(item.getWarehouseId())
+                        .warehouseName(warehouseMap.containsKey(item.getWarehouseId()) ? warehouseMap.get(item.getWarehouseId()).getName() : null)
+                        .areaId(item.getAreaId())
+                        .areaName(areaMap.containsKey(item.getAreaId()) ? areaMap.get(item.getAreaId()).getAreaName() : null)
+                        .productId(moldBrand.getId())
+                        .productUnitId(null)
+                        .productPrice(item.getProductPrice())
+                        .count(item.getCount())
+                        .packagingSchemeId(item.getPackagingSchemeId())
+                        .inputUnitType(item.getInputUnitType())
+                        .inputCount(item.getInputCount())
+                        .totalPrice(MoneyUtils.priceMultiply(item.getProductPrice(), item.getCount()))
+                        .remark(item.getRemark())
+                        .deviceId(item.getDeviceId())
+                        .build();
+            });
+        }
+
+        List<ErpProductDO> productList = productService.validProductList(convertSet(list, ErpStockInSaveReqVO.Item::getProductId));
+        Map<Long, ErpProductDO> productMap = convertMap(productList, ErpProductDO::getId);
+        Map<Long, ErpWarehouseDO> warehouseMap = convertMap(
+                warehouseService.getWarehouseList(convertSet(list, ErpStockInSaveReqVO.Item::getWarehouseId)),
+                ErpWarehouseDO::getId);
+        Map<Long, WarehouseAreaDO> areaMap = warehouseAreaService.getWarehouseAreaMap(
+                convertSet(list, ErpStockInSaveReqVO.Item::getAreaId));
+        return convertList(list, item -> BeanUtils.toBean(item, ErpStockInItemDO.class, target -> target
+                .setWarehouseName(warehouseMap.containsKey(target.getWarehouseId()) ? warehouseMap.get(target.getWarehouseId()).getName() : null)
+                .setAreaName(areaMap.containsKey(target.getAreaId()) ? areaMap.get(target.getAreaId()).getAreaName() : null)
+                .setProductUnitId(productMap.get(target.getProductId()).getUnitId())
+                .setTotalPrice(MoneyUtils.priceMultiply(target.getProductPrice(), target.getCount()))));
+    }
+
+    private void validateWarehouseAreas(List<ErpStockInSaveReqVO.Item> list) {
+        Map<Long, ErpWarehouseDO> warehouseMap = convertMap(
+                warehouseService.validWarehouseList(convertSet(list, ErpStockInSaveReqVO.Item::getWarehouseId)),
+                ErpWarehouseDO::getId);
+        Map<Long, WarehouseAreaDO> areaMap = warehouseAreaService.getWarehouseAreaMap(
+                convertSet(list, ErpStockInSaveReqVO.Item::getAreaId));
+        list.forEach(item -> {
+            WarehouseAreaDO area = areaMap.get(item.getAreaId());
+            if (area == null) {
+                throw exception(WAREHOUSE_AREA_NOT_EXISTS);
+            }
+            if (!warehouseMap.containsKey(item.getWarehouseId())
+                    || !Objects.equals(item.getWarehouseId(), area.getWarehouseId())) {
+                throw exception(WAREHOUSE_LOCATION_WAREHOUSE_AREA_NOT_MATCH);
+            }
+        });
+    }
+
+    private void updateStockInItemList(Long id, List<ErpStockInItemDO> newList) {
+        boolean moldStockIn = CollUtil.isNotEmpty(newList)
+                && newList.stream().anyMatch(item -> item.getMoldSetId() != null);
+        if (moldStockIn) {
+            stockInItemMapper.deleteByInId(id);
+            newList.forEach(item -> {
+                item.setId(null);
+                item.setInId(id);
+            });
+            stockInItemMapper.insertBatch(newList);
+            return;
+        }
+
+        List<ErpStockInItemDO> oldList = stockInItemMapper.selectListByInId(id);
+        List<List<ErpStockInItemDO>> diffList = diffList(oldList, newList,
+                (oldVal, newVal) -> Objects.equals(oldVal.getId(), newVal.getId()));
+        if (CollUtil.isNotEmpty(diffList.get(0))) {
+            diffList.get(0).forEach(item -> item.setInId(id));
+            stockInItemMapper.insertBatch(diffList.get(0));
+        }
+        if (CollUtil.isNotEmpty(diffList.get(1))) {
+            stockInItemMapper.updateBatch(diffList.get(1));
+        }
+        if (CollUtil.isNotEmpty(diffList.get(2))) {
+            stockInItemMapper.deleteBatchIds(convertList(diffList.get(2), ErpStockInItemDO::getId));
+        }
+    }
 }
+

yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/warehousearea/WarehouseAreaService.java

@@ -45,6 +45,16 @@ public interface WarehouseAreaService {
      */
     WarehouseAreaDO getWarehouseArea(Long id);
 
+    List<WarehouseAreaDO> getWarehouseAreaList(Collection<Long> ids);
+
+    default Map<Long, WarehouseAreaDO> getWarehouseAreaMap(Collection<Long> ids) {
+        if (ids == null || ids.isEmpty()) {
+            return new HashMap<>();
+        }
+        return cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap(
+                getWarehouseAreaList(ids), WarehouseAreaDO::getId);
+    }
+
     /**
      * 获得ERP 库区信息分页
      *

yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/warehousearea/WarehouseAreaServiceImpl.java

@@ -13,6 +13,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
+import java.util.Collection;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -72,6 +73,14 @@ public class WarehouseAreaServiceImpl implements WarehouseAreaService {
         return warehouseAreaMapper.selectById(id);
     }
 
+    @Override
+    public List<WarehouseAreaDO> getWarehouseAreaList(Collection<Long> ids) {
+        if (ids == null || ids.isEmpty()) {
+            return new ArrayList<>();
+        }
+        return warehouseAreaMapper.selectBatchIds(ids);
+    }
+
     @Override
     public PageResult<WarehouseAreaDO> getWarehouseAreaPage(WarehouseAreaPageReqVO pageReqVO) {
         return warehouseAreaMapper.selectPage(pageReqVO);

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldplanmaintenance/vo/MoldPlanMaintenanceRespVO.java

@@ -1,6 +1,7 @@
 package cn.iocoder.yudao.module.mes.controller.admin.moldplanmaintenance.vo;
 
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.moldsubject.MoldSubjectDO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 import java.util.*;
@@ -36,7 +37,10 @@ public class MoldPlanMaintenanceRespVO extends BaseDO {
     @Schema(description = "项目集合ids")
     private List<Long>  subjectIds;
 
+    @Schema(description = "项目集合")
+    private List<MoldSubjectDO> subjectList;
+
     @Schema(description = "创建人名字")
     @ExcelProperty("创建人名字")
     private String creatorName;
-}
+}

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldtaskmanagement/vo/MoldTaskManagementCreateTicketReqVO.java

@@ -1,11 +1,14 @@
 package cn.iocoder.yudao.module.mes.controller.admin.moldtaskmanagement.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import cn.iocoder.yudao.module.common.controller.admin.moldticketresults.vo.MoldTicketResultsSaveReqVO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import javax.validation.Valid;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import java.util.List;
 
 @Schema(description = "管理后台 - 模具任务管理直接创建工单 Request VO")
 @Data
@@ -46,4 +49,8 @@ public class MoldTaskManagementCreateTicketReqVO {
 
     @Schema(description = "是否启用")
     private Boolean enabled;
+
+    @Schema(description = "工单检验结果集合，可直接传入创建")
+    @Valid
+    private List<MoldTicketResultsSaveReqVO> ticketResultsList;
 }

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/moldplanmaintenance/MoldPlanMaintenanceDO.java

@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.mes.dal.dataobject.moldplanmaintenance;
 
+import cn.iocoder.yudao.module.mes.dal.dataobject.moldsubject.MoldSubjectDO;
 import lombok.*;
 import java.util.*;
 import java.time.LocalDateTime;
@@ -45,4 +46,10 @@ public class MoldPlanMaintenanceDO extends BaseDO {
      */
     @TableField(exist = false)
     private List<Long> subjectIds;
-}
+
+    /**
+     * 项目集合
+     */
+    @TableField(exist = false)
+    private List<MoldSubjectDO> subjectList;
+}

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/moldplanmaintenance/MoldPlanMaintenanceServiceImpl.java

@@ -158,12 +158,18 @@ public class MoldPlanMaintenanceServiceImpl implements MoldPlanMaintenanceServic
         PageResult<MoldPlanMaintenanceDO> moldplanMaintenanceDOPageResult = moldplanMaintenanceMapper.selectPage(pageReqVO);
         for (MoldPlanMaintenanceDO moldplanMaintenanceDO : moldplanMaintenanceDOPageResult.getList()) {
             List<Long> ids = new ArrayList<>();
+            List<MoldSubjectDO> subjectList = new ArrayList<>();
             List<SubjectMoldPlanDO> subjectMoldPlanDOList = subjectMoldPlanMapper.selectList(Wrappers.<SubjectMoldPlanDO>lambdaQuery()
                     .eq(SubjectMoldPlanDO::getPlanId, moldplanMaintenanceDO.getId()));
             for (SubjectMoldPlanDO subjectMoldPlanDO : subjectMoldPlanDOList) {
                 ids.add(subjectMoldPlanDO.getSubjectId());
+                MoldSubjectDO moldSubjectDO = moldSubjectMapper.selectById(subjectMoldPlanDO.getSubjectId());
+                if (moldSubjectDO != null) {
+                    subjectList.add(moldSubjectDO);
+                }
             }
             moldplanMaintenanceDO.setSubjectIds(ids);
+            moldplanMaintenanceDO.setSubjectList(subjectList);
         }
 
 
@@ -189,4 +195,4 @@ public class MoldPlanMaintenanceServiceImpl implements MoldPlanMaintenanceServic
         return moldSubjectDOList;
     }
 
-}
+}

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/moldtaskmanagement/MoldTaskManagementServiceImpl.java

@@ -1,7 +1,10 @@
 package cn.iocoder.yudao.module.mes.service.moldtaskmanagement;
 
+import cn.iocoder.yudao.framework.security.core.LoginUser;
+import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.common.controller.admin.moldticketresults.vo.MoldTicketResultsSaveReqVO;
 import cn.iocoder.yudao.module.common.dal.dataobject.mold.MoldBrandDO;
 import cn.iocoder.yudao.module.common.dal.dataobject.moldticketmanagement.MoldTicketManagementDO;
 import cn.iocoder.yudao.module.common.dal.dataobject.moldticketresults.MoldTicketResultsDO;
@@ -11,6 +14,7 @@ import cn.iocoder.yudao.module.common.dal.mysql.moldticketresults.MoldTicketResu
 import cn.iocoder.yudao.module.mes.controller.admin.moldtaskmanagement.vo.MoldTaskManagementCreateTicketReqVO;
 import cn.iocoder.yudao.module.mes.controller.admin.moldtaskmanagement.vo.MoldTaskManagementPageReqVO;
 import cn.iocoder.yudao.module.mes.controller.admin.moldtaskmanagement.vo.MoldTaskManagementSaveReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.moldticketresults.enums.MoldJobResultEnum;
 import cn.iocoder.yudao.module.mes.dal.dataobject.moldplanmaintenance.MoldPlanMaintenanceDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.moldsubject.MoldSubjectDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.moldtaskmanagement.MoldTaskManagementDO;
@@ -28,9 +32,12 @@ import org.springframework.validation.annotation.Validated;
 import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 import java.util.Random;
 import java.util.stream.Collectors;
 
@@ -126,22 +133,31 @@ public class MoldTaskManagementServiceImpl implements MoldTaskManagementService
         }
         createMoldTicketInternal(moldtaskManagementDO.getId(), moldtaskManagementDO.getProjectForm(),
                 moldtaskManagementDO.getTaskType(), moldtaskManagementDO.getName(),
-                moldtaskManagementDO.getEndDate(), moldtaskManagementDO.getMoldList());
+                moldtaskManagementDO.getEndDate(), moldtaskManagementDO.getMoldList(), null);
     }
 
     @Override
     public void createMoldTicketDirect(MoldTaskManagementCreateTicketReqVO createReqVO) {
         createMoldTicketInternal(createReqVO.getId(), createReqVO.getProjectForm(), createReqVO.getTaskType(),
-                createReqVO.getName(), createReqVO.getEndDate()!=null?LocalDate.parse(createReqVO.getEndDate()):null, createReqVO.getMoldList());
+                createReqVO.getName(), createReqVO.getEndDate()!=null?LocalDate.parse(createReqVO.getEndDate()):null,
+                createReqVO.getMoldList(), createReqVO.getTicketResultsList());
     }
 
     private void createMoldTicketInternal(Long taskId, Long planId, Integer taskType, String configName,
-                                          LocalDate endDate, String moldList) {
+                                          LocalDate endDate, String moldList,
+                                          List<MoldTicketResultsSaveReqVO> ticketResultsList) {
         List<Long> moldIds = Arrays.stream(moldList.split(","))
                 .map(String::trim)
                 .map(Long::valueOf)
                 .collect(Collectors.toList());
 
+        List<SubjectMoldPlanDO> subjectmoldPlanDOList = subjectmoldPlanMapper.selectList(
+                Wrappers.<SubjectMoldPlanDO>lambdaQuery().eq(SubjectMoldPlanDO::getPlanId, planId));
+        List<MoldSubjectDO> moldSubjectDOList = subjectmoldPlanDOList.stream()
+                .map(subjectmoldPlanDO -> moldSubjectMapper.selectById(subjectmoldPlanDO.getSubjectId()))
+                .filter(Objects::nonNull)
+                .collect(Collectors.toList());
+
         for (Long moldId : moldIds) {
             MoldBrandDO moldDO = moldBrandMapper.selectById(moldId);
 
@@ -155,11 +171,9 @@ public class MoldTaskManagementServiceImpl implements MoldTaskManagementService
             moldticketManagementDO.setTaskEndTime(endDate !=null ? endDate.atStartOfDay(): null);
             moldticketManagementMapper.insert(moldticketManagementDO);
 
-            List<SubjectMoldPlanDO> subjectmoldPlanDOList = subjectmoldPlanMapper.selectList(
-                    Wrappers.<SubjectMoldPlanDO>lambdaQuery().eq(SubjectMoldPlanDO::getPlanId, planId));
-            for (SubjectMoldPlanDO subjectmoldPlanDO : subjectmoldPlanDOList) {
-                MoldSubjectDO moldSubjectDO = moldSubjectMapper.selectById(subjectmoldPlanDO.getSubjectId());
-
+            List<MoldTicketResultsDO> createdResults = new ArrayList<>();
+            for (int index = 0; index < moldSubjectDOList.size(); index++) {
+                MoldSubjectDO moldSubjectDO = moldSubjectDOList.get(index);
                 MoldTicketResultsDO moldticketResultsDO = new MoldTicketResultsDO();
                 moldticketResultsDO.setInspectionItemName(moldSubjectDO.getSubjectName());
                 moldticketResultsDO.setInspectionMethod(moldSubjectDO.getInspectionMethod());
@@ -167,9 +181,88 @@ public class MoldTaskManagementServiceImpl implements MoldTaskManagementService
                 moldticketResultsDO.setManagementId(moldticketManagementDO.getId());
                 moldticketResultsDO.setMoldId(moldId);
                 moldticketResultsDO.setValueType(moldSubjectDO.getValueType());
+                mergeTicketResultData(moldticketResultsDO,
+                        findMatchedTicketResult(ticketResultsList, moldSubjectDO.getSubjectName(), index));
                 moldticketResultsMapper.insert(moldticketResultsDO);
+                createdResults.add(moldticketResultsDO);
             }
+
+            handleInspectionResult(moldticketManagementDO, createdResults);
+        }
+    }
+
+    private MoldTicketResultsSaveReqVO findMatchedTicketResult(List<MoldTicketResultsSaveReqVO> ticketResultsList,
+                                                               String subjectName, int index) {
+        if (CollectionUtils.isEmpty(ticketResultsList)) {
+            return null;
+        }
+        for (MoldTicketResultsSaveReqVO ticketResults : ticketResultsList) {
+            if (ticketResults != null && subjectName != null
+                    && subjectName.equals(ticketResults.getInspectionItemName())) {
+                return ticketResults;
+            }
+        }
+        return index < ticketResultsList.size() ? ticketResultsList.get(index) : null;
+    }
+
+    private void mergeTicketResultData(MoldTicketResultsDO moldticketResultsDO,
+                                       MoldTicketResultsSaveReqVO ticketResults) {
+        if (ticketResults == null) {
+            return;
+        }
+        if (ticketResults.getInspectionMethod() != null) {
+            moldticketResultsDO.setInspectionMethod(ticketResults.getInspectionMethod());
+        }
+        if (ticketResults.getJudgmentCriteria() != null) {
+            moldticketResultsDO.setJudgmentCriteria(ticketResults.getJudgmentCriteria());
+        }
+        if (ticketResults.getInspectionResult() != null) {
+            moldticketResultsDO.setInspectionResult(ticketResults.getInspectionResult());
         }
+        if (ticketResults.getImages() != null) {
+            moldticketResultsDO.setImages(ticketResults.getImages());
+        }
+        if (ticketResults.getRemark() != null) {
+            moldticketResultsDO.setRemark(ticketResults.getRemark());
+        }
+        if (ticketResults.getInspectionTime() != null) {
+            moldticketResultsDO.setInspectionTime(ticketResults.getInspectionTime());
+        }
+        if (ticketResults.getValueType() != null) {
+            moldticketResultsDO.setValueType(ticketResults.getValueType());
+        }
+        if (ticketResults.getTextInput() != null) {
+            moldticketResultsDO.setTextInput(ticketResults.getTextInput());
+        }
+    }
+
+    private void handleInspectionResult(MoldTicketManagementDO moldticketManagementDO,
+                                        List<MoldTicketResultsDO> ticketResultsList) {
+        if (moldticketManagementDO == null || CollectionUtils.isEmpty(ticketResultsList)) {
+            return;
+        }
+
+        boolean hasPending = ticketResultsList.stream()
+                .anyMatch(result -> result.getInspectionResult() == null
+                        || result.getInspectionResult().equals(MoldJobResultEnum.PENDING.getCode()));
+        if (hasPending) {
+            return;
+        }
+
+        moldticketManagementDO.setTaskTime(LocalDateTime.now());
+        moldticketManagementDO.setJobStatus(1);
+
+        boolean hasFail = ticketResultsList.stream()
+                .anyMatch(result -> result.getInspectionResult() != null
+                        && result.getInspectionResult().equals(MoldJobResultEnum.FAIL.getCode()));
+        moldticketManagementDO.setJobResult(hasFail ? MoldJobResultEnum.FAIL.getCode() : MoldJobResultEnum.PASS.getCode());
+
+        LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
+        if (loginUser != null) {
+            moldticketManagementDO.setOperator(String.valueOf(loginUser.getId()));
+        }
+
+        moldticketManagementMapper.updateById(moldticketManagementDO);
     }
 
     public static String generatePrefixedOrderNo() {