Merge remote-tracking branch 'origin/test' into test

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

@@ -37,7 +37,7 @@ import com.zt.plat.module.qms.resource.material.service.MaterialInventoryCheckSe
 
 @Tag(name = "管理后台 - 库存盘点")
 @RestController
-@RequestMapping("/qms/material-inventory-check")
+@RequestMapping("/qms/resource/material-inventory-check")
 @Validated
 @FileUploadController(source = "qms.materialinventorycheck")
 public class MaterialInventoryCheckController extends AbstractFileUploadController implements BusinessControllerMarker{
@@ -115,4 +115,21 @@ public class MaterialInventoryCheckController extends AbstractFileUploadControll
                         BeanUtils.toBean(list, MaterialInventoryCheckRespVO.class));
     }
 
+
+    @PostMapping("/create-form")
+    @Operation(summary = "创建库存盘点")
+    public CommonResult<MaterialInventoryCheckRespVO> createMaterialInventoryCheckForm(@Valid @RequestBody MaterialInventoryCheckSaveReqVO createReqVO) {
+
+
+        return success(materialInventoryCheckService.createMaterialInventoryCheckForm(createReqVO));
+    }
+
+    @GetMapping("/get-form")
+    @Operation(summary = "获得库存盘点")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('qms:material-inventory-check:query')")
+    public CommonResult<MaterialInventoryCheckRespVO> getMaterialInventoryCheckForm(@RequestParam("id") Long id) {
+
+        return success(materialInventoryCheckService.getMaterialInventoryCheckForm(id));
+    }
 }

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

@@ -119,8 +119,9 @@ public class MaterialInventoryInboundController extends AbstractFileUploadContro
 
     @PostMapping("/multi-put")
     @Operation(summary = "批量上架")
-    public CommonResult<PageResult<MaterialInventoryInboundRespVO>>  createMaterialInventoryInboundMulti(@Valid @RequestBody MaterialInventoryInboundSaveReqVO createReqVO) {
-        return success(materialInventoryInboundService.multiCreateMaterialInventoryInbound(createReqVO));
+    public CommonResult<Boolean>  createMaterialInventoryInboundMulti(@Valid @RequestBody MaterialInventoryInboundSaveReqVO createReqVO) {
+        materialInventoryInboundService.multiCreateMaterialInventoryInbound(createReqVO);
+        return success(true);
     }
 
     @PostMapping("single-put")

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

@@ -115,4 +115,10 @@ public class MaterialInventoryInboundDetailController extends AbstractFileUpload
                         BeanUtils.toBean(list, MaterialInventoryInboundDetailRespVO.class));
     }
 
+    @GetMapping("/page-list")
+    @Operation(summary = "获得入库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等分页")
+    public CommonResult<PageResult<MaterialInventoryInboundDetailRespVO>> getMaterialInventoryInboundDetailPageList(@Valid MaterialInventoryInboundDetailPageReqVO pageReqVO) {
+        PageResult<MaterialInventoryInboundDetailRespVO> pageResult = materialInventoryInboundDetailService.getMaterialInventoryInboundDetailPageList(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, MaterialInventoryInboundDetailRespVO.class));
+    }
 }

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

@@ -79,7 +79,7 @@ public class MaterialInfomationPageReqVO extends PageParam {
     List<Long> productIds;
 
     @Schema(description = "入库id")
-    private long inventoryInboundId;
+    private Long inventoryInboundId;
 
 
 }

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

@@ -36,4 +36,7 @@ public class MaterialInventoryCheckBatchSaveReqVO {
     @Schema(description = "备注")
     private String remark;
 
+    @Schema(description = "盘点明细")
+    private List<MaterialInventoryCheckDetailSaveReqVO> detailList;
+
 }

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

@@ -54,4 +54,6 @@ public class MaterialInventoryCheckPageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
 
+    @Schema(description = "主键")
+    private Long id;
 }

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

@@ -68,4 +68,7 @@ public class MaterialInventoryCheckRespVO {
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;
 
+    @Schema(description = "盘点项")
+    @ExcelProperty("盘点项")
+    private List<MaterialInventoryCheckBatchRespVO> batchList;
 }

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

@@ -50,4 +50,7 @@ public class MaterialInventoryCheckSaveReqVO {
     @Schema(description = "备注")
     private String remark;
 
+    @Schema(description = "盘点项")
+    private List<MaterialInventoryCheckBatchSaveReqVO> batchList;
+
 }

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

@@ -50,4 +50,7 @@ public class MaterialInventoryInboundDetailPageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
 
+    @Schema(description = "物料大类Id")
+    private Long  productId;
+
 }

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

@@ -63,4 +63,6 @@ public class MaterialInventoryInboundDetailRespVO {
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;
 
+    private Long productId;
+
 }