fix:物料盘点出入库；修复循环依赖。

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

@@ -39,19 +39,13 @@ public class MaterialInventoryCheckDetailController implements BusinessControlle
     @Resource
     private MaterialInventoryCheckDetailService materialInventoryCheckDetailService;
 
-    @PostMapping("/add")
+//    @PostMapping("/add")
     @Operation(summary = "新增库存盘点明细")
 //    @PreAuthorize("@ss.hasPermission('qms:material-inventory-check-detail:create')")
     public CommonResult<MaterialInventoryCheckDetailRespVO> createMaterialInventoryCheckDetail(@Valid @RequestBody MaterialInventoryCheckDetailSaveReqVO createReqVO) {
         return success(materialInventoryCheckDetailService.createMaterialInventoryCheckDetail(createReqVO));
     }
 
-    @PutMapping("/inventory-inf")
-    @Operation(summary = "盘点物料")
-    public CommonResult<MaterialInventoryCheckDetailRespVO> inventoryCheckInfomation(@Valid @RequestBody MaterialInventoryCheckDetailSaveReqVO inventoryReqVO) {
-        return success(materialInventoryCheckDetailService.inventoryCheckInfomation(inventoryReqVO));
-    }
-
 //    @PutMapping("/update")
     @Operation(summary = "更新库存盘点明细")
     @PreAuthorize("@ss.hasPermission('qms:material-inventory-check-detail:update')")

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

@@ -116,6 +116,12 @@ public class MaterialLifecycleController extends AbstractFileUploadController im
         return success(materialLifecycleService.operatorSubmitLifecycle(id));
     }
 
+    @PutMapping("/inventory-inf")
+    @Operation(summary = "盘点物料")
+    public CommonResult<MaterialInventoryCheckDetailRespVO> inventoryCheckInfomation(@Valid @RequestBody MaterialInventoryCheckDetailSaveReqVO inventoryReqVO) {
+        return success(materialLifecycleService.inventoryCheckInfomation(inventoryReqVO));
+    }
+
     @GetMapping("/export-excel")
     @Operation(summary = "导出物料通用流程,物料验收、退换货 Excel")
     @PreAuthorize("@ss.hasPermission('qms:material-lifecycle:export')")

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

@@ -45,6 +45,9 @@ public class MaterialInventoryCheckDetailRespVO {
     @ExcelProperty("是否存在,1-存在，0-不存在")
     private Integer present;
 
+    @Schema(description = "是否在库,1-在库，0-不在库")
+    private Integer atWarehouse;
+
     @Schema(description = "当前数量")
     @ExcelProperty("当前数量")
     private String currentQuantity;

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

@@ -52,6 +52,11 @@ public class MaterialInventoryCheckDetailDO extends BusinessBaseDO {
     @TableField("PRST")
     private Integer present;
     /**
+    * 是否在库，1-在库，0-不在库
+    */
+    @TableField("AT_WRH")
+    private Integer atWarehouse;
+    /**
     * 当前数量
     */
     @TableField("CRNT_QTY")

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/enums/MaterialFlowType.java

@@ -9,7 +9,7 @@ public enum MaterialFlowType {
 
     return_material("退货"),
 
-    exchange_material("换货"),
+    replace_material("换货"),
 
     make_apply("配置申请"),
 

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/enums/MaterialInboundType.java

@@ -9,7 +9,7 @@ import lombok.Getter;
 public enum MaterialInboundType {
     acceptance_inbound("验收入库"),
 
-    check_over_inbound("盘盈入库");
+    check_inbound("盘点入库");
 
     private final String name;
 

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/enums/MaterialOutboundType.java

@@ -13,7 +13,7 @@ public enum MaterialOutboundType {
 
     replace_outbound("换货出库"),
 
-    check_short_outbound("盘亏出库");
+    check_outbound("盘点出库");
 
     private final String name;
 

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialBatchService.java

@@ -105,14 +105,6 @@ public interface MaterialBatchService {
      */
     void updateById(MaterialBatchDO gongDO);
 
-    /**
-     * 更新批次工段验收状态
-     *
-     * @param lfcId 流程id
-     * @param status 验收状态
-     */
-    void updateMaterialBatchAcceptStatusByLfcId(Long lfcId, String status);
-
     /**
      * 根据批次id 获取批次信息
      *
@@ -185,13 +177,6 @@ public interface MaterialBatchService {
      */
     void updateBatchVerifyCalibrateCount(List<MaterialLifecycleDetailDO> batches, AdjustType adjustType);
 
-    /**
-     * 创建批次检定拆分工段
-     *
-     * @param id 流程id
-     */
-    void createVerifyBatchAssignsByLfcId(Long id);
-
     /**
      * 导入物料批次列表
      *
@@ -199,4 +184,18 @@ public interface MaterialBatchService {
      * @return 导入结果
      */
     MaterialBatchImportRespVO importMaterialBatchList(List<MaterialBatchImportExcelVO> importList);
+
+    /**
+     * 根据ids 更新
+     *
+     * @param ids ids
+     */
+    void updateByIds(List<Long> ids, MaterialBatchDO updateEntity);
+
+    /**
+     * 批量保存
+     *
+     * @param dos 实体集合
+     */
+    void saveBatch(List<MaterialBatchDO> dos);
 }

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialInfomationService.java

@@ -105,7 +105,7 @@ public interface MaterialInfomationService {
      * @param infomationIds id集合
      * @return 物料信息
      */
-    List<MaterialInfomationDO> getMaterialInfomationsByIds(List<Long> infomationIds);
+    List<MaterialInfomationDO> getListByIds(List<Long> infomationIds);
 
     /**
      * 保存物料实例