feat:物料退换货

zt-module-qms/zt-module-qms-api/src/main/java/com/zt/plat/module/qms/enums/AdjustType.java

@@ -0,0 +1,6 @@
+package com.zt.plat.module.qms.enums;
+
+public enum AdjustType {
+    add,
+    subtract,
+}

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/admin/MaterialBatchController.java

@@ -18,7 +18,6 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Operation;
 
-import jakarta.validation.constraints.*;
 import jakarta.validation.*;
 import jakarta.servlet.http.*;
 import java.util.*;
@@ -134,7 +133,7 @@ public class MaterialBatchController implements BusinessControllerMarker {
     @Operation(summary = "获取工段列表")
     @Parameter(name = "id", description = "物料批次 id", required = true, example = "1054")
     public CommonResult<List<MaterialBatchRespVO>> getMaterialBatchGongduanList(@RequestParam("id") Long id) {
-        List<MaterialBatchDO> list = materialBatchService.getMaterialBatchGongduanList(id);
+        List<MaterialBatchDO> list = materialBatchService.getGongduanListByBatIds(Collections.singletonList(id));
         return success(BeanUtils.toBean(list, MaterialBatchRespVO.class));
     }
 

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/admin/MaterialUseEndReuseController.java

@@ -55,7 +55,7 @@ public class MaterialUseEndReuseController extends AbstractFileUploadController
         return success(materialUseEndReuseService.createMaterialUseEndReuse(createReqVO));
     }
 
-    @PutMapping("/update")
+//    @PutMapping("/update")
     @Operation(summary = "更新物料用完标记或清洗回收")
     @PreAuthorize("@ss.hasPermission('qms:material-use-end-reuse:update')")
     public CommonResult<Boolean> updateMaterialUseEndReuse(@Valid @RequestBody MaterialUseEndReuseSaveReqVO updateReqVO) {

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialBatchRespVO.java

@@ -53,6 +53,14 @@ public class MaterialBatchRespVO {
     @ExcelProperty("总数量")
     private BigDecimal inboundQuantity;
 
+    @Schema(description = "退货数量")
+    @ExcelProperty("退货数量")
+    private BigDecimal returnQuantity;
+
+    @Schema(description = "换货数量")
+    @ExcelProperty("换货数量")
+    private BigDecimal replaceQuantity;
+
     @Schema(description = "已入库数量")
     @ExcelProperty("已入库数量")
     private BigDecimal inboundEndQuantity;

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialLifecycleDetailSaveReqVO.java

@@ -3,6 +3,8 @@ package com.zt.plat.module.qms.resource.material.controller.vo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 @Schema(description = "管理后台 - 物料通用流程明细新增/修改 Request VO")
 @Data
 public class MaterialLifecycleDetailSaveReqVO {
@@ -29,7 +31,7 @@ public class MaterialLifecycleDetailSaveReqVO {
     private Long infomationId;
 
     @Schema(description = "影响数量", example = "15772")
-    private String influenceCount;
+    private BigDecimal influenceCount;
 
     @Schema(description = "明细操作类型,【字典】【jy_material_lifecycle_detail_bsn_type】", example = "1")
     private String businessType;

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialLifecycleSaveReqVO.java

@@ -47,15 +47,6 @@ public class MaterialLifecycleSaveReqVO {
     @Schema(description = "表单数据,表单数据")
     private String formData;
 
-//    @Schema(description = "流程实例id", example = "12151")
-//    private String flowInstanceId;
-
-//    @Schema(description = "提交状态,提交状态,0-未提交，1-已提交", example = "1")
-//    private Integer submitStatus;
-
-//    @Schema(description = "流程审批状态", example = "1")
-//    private String flowStatus;
-
     @Schema(description = "所属部门")
     private String systemDepartmentCode;
 

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialUseEndReuseRespVO.java

@@ -37,6 +37,10 @@ public class MaterialUseEndReuseRespVO {
     @ExcelProperty("所属部门")
     private String systemDepartmentCode;
 
+    @Schema(description = "部门")
+    @ExcelProperty("部门")
+    private String departmentName;
+
     @Schema(description = "备注")
     @ExcelProperty("备注")
     private String remark;

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/dataobject/MaterialBatchDO.java

@@ -53,6 +53,16 @@ public class MaterialBatchDO extends BusinessBaseDO {
     @TableField("INB_QTY")
     private BigDecimal inboundQuantity;
     /**
+    * 退货数量
+    */
+    @TableField("RTN_QTY")
+    private BigDecimal returnQuantity;
+    /**
+    * 换货数量
+    */
+    @TableField("REP_QTY")
+    private BigDecimal replaceQuantity;
+    /**
     * 已入库数量
     */
     @TableField("INB_END_QTY")

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/dataobject/MaterialLifecycleDetailDO.java

@@ -3,6 +3,9 @@ package com.zt.plat.module.qms.resource.material.dal.dataobject;
 import com.baomidou.mybatisplus.annotation.*;
 import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO;
 import lombok.*;
+
+import java.math.BigDecimal;
+
 /**
 * 物料通用流程明细 DO
 *
@@ -62,7 +65,7 @@ public class MaterialLifecycleDetailDO extends BusinessBaseDO {
     * 影响数量
     */
     @TableField("INFL_CNT")
-    private String influenceCount;
+    private BigDecimal influenceCount;
     /**
     * 明细操作类型,【字典】【jy_material_lifecycle_detail_bsn_type】
     */

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/dataobject/MaterialUseEndReuseDO.java

@@ -55,6 +55,12 @@ public class MaterialUseEndReuseDO extends BusinessBaseDO {
     */
     @TableField("SYS_DEPT_CD")
     private String systemDepartmentCode;
+
+    /**
+     * 所属部门
+     */
+    @TableField("DEPT_NAME")
+    private String departmentName;
     /**
     * 备注
     */