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

zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/dto/contract/ContractReceiveSendRespDTO.java

@@ -4,6 +4,7 @@ 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 = "管理后台 - 收发货规则 Response VO")
@@ -47,11 +48,11 @@ public class ContractReceiveSendRespDTO {
 
     @Schema(description = "区间下限")
     @ExcelProperty("区间下限")
-    private String gradeDown;
+    private BigDecimal gradeDown;
 
     @Schema(description = "区间上限")
     @ExcelProperty("区间上限")
-    private String gradeUp;
+    private BigDecimal gradeUp;
 
     @Schema(description = "合同id", example = "22162")
     @ExcelProperty("合同id")

zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/ContractReceiveSendPageReqVO.java

@@ -5,6 +5,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
 import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@@ -38,10 +39,10 @@ public class ContractReceiveSendPageReqVO extends PageParam {
     private String rangeWay;
 
     @Schema(description = "区间下限")
-    private String gradeDown;
+    private BigDecimal gradeDown;
 
     @Schema(description = "区间上限")
-    private String gradeUp;
+    private BigDecimal gradeUp;
 
     @Schema(description = "合同id", example = "22162")
     private Long contractId;

zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/ContractReceiveSendRespVO.java

@@ -5,6 +5,7 @@ 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 = "管理后台 - 收发货规则 Response VO")
@@ -50,11 +51,11 @@ public class ContractReceiveSendRespVO {
 
     @Schema(description = "区间下限")
     @ExcelProperty("区间下限")
-    private String gradeDown;
+    private BigDecimal gradeDown;
 
     @Schema(description = "区间上限")
     @ExcelProperty("区间上限")
-    private String gradeUp;
+    private BigDecimal gradeUp;
 
     @Schema(description = "合同id", example = "22162")
     @ExcelProperty("合同id")

zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/ContractReceiveSendSaveReqVO.java

@@ -3,6 +3,8 @@ package com.zt.plat.module.contractorder.api.vo.contract;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 @Schema(description = "管理后台 - 收发货规则新增/修改 Request VO")
 @Data
 public class ContractReceiveSendSaveReqVO {
@@ -35,10 +37,10 @@ public class ContractReceiveSendSaveReqVO {
     private String rangeWay;
 
     @Schema(description = "区间下限")
-    private String gradeDown;
+    private BigDecimal gradeDown;
 
     @Schema(description = "区间上限")
-    private String gradeUp;
+    private BigDecimal gradeUp;
 
     @Schema(description = "合同id", example = "22162")
     private Long contractId;

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/contractreceivesend/ContractReceiveSendDO.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.*;
 import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO;
 import lombok.*;
 
+import java.math.BigDecimal;
+
 /**
 * 收发货规则 DO
 *
@@ -73,12 +75,12 @@ public class ContractReceiveSendDO extends BusinessBaseDO {
     * 区间下限
     */
     @TableField("GRD_DOWN")
-    private String gradeDown;
+    private BigDecimal gradeDown;
     /**
     * 区间上限
     */
     @TableField("GRD_UP")
-    private String gradeUp;
+    private BigDecimal gradeUp;
     /**
     * 合同id
     */

zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/enums/ErrorCodeConstants.java

@@ -58,5 +58,7 @@ public interface ErrorCodeConstants {
 
     ErrorCode MATERIAL_ERROR  = new ErrorCode( 1_017_000_009, "主物料信息错误");
 
+    ErrorCode INTERNAL_WAREHOUSE_NOT_EXISTS= new  ErrorCode(1_017_000_011,"内部仓库不存在");
+
     ErrorCode WAREHOUSE_FACTORY_NOT_EXISTS=new  ErrorCode(1_017_000_010,"库位与工厂信息不存在");
 }

zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/ErpMaterialController.java

@@ -168,9 +168,8 @@ public class ErpMaterialController {
     @GetMapping("/erpMaterial-mainMaterial-code")
     @Operation(summary = "通过主物料编号查询子物料信息")
     @PreAuthorize("@ss.hasPermission('sply:erp-material:query')")
-    public CommonResult<List<ErpMaterialRespVO>> getErpMaterialByMainMaterialByCOde(String code) {
-
-        return success(BeanUtils.toBean(List.of(new MaterialInfomationPageReqDTO()), ErpMaterialRespVO.class));
+    public CommonResult<ErpMaterialRespVO> getErpMaterialByMainMaterialByCode(String code) {
+        return success(BeanUtils.toBean(erpMaterialService.getErpMaterialByMainMaterialByCode(code), ErpMaterialRespVO.class));
     }
 
     //查询物料
@@ -179,6 +178,6 @@ public class ErpMaterialController {
     @PreAuthorize("@ss.hasPermission('sply:erp-material:query')")
     public CommonResult<List<ErpMaterialRespVO>> getErpMaterialByApiByCode(String code) {
 
-        return success(BeanUtils.toBean(List.of(new MaterialInfomationPageReqDTO()), ErpMaterialRespVO.class));
+        return success(BeanUtils.toBean(erpMaterialService.getErpMaterialByApiByCode(code), ErpMaterialRespVO.class));
     }
 }

zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/ErpWarehouseController.java

@@ -83,8 +83,8 @@ public class ErpWarehouseController {
     @GetMapping("/page")
     @Operation(summary = "获得ERP库位分页")
     @PreAuthorize("@ss.hasPermission('sply:erp-warehouse:query')")
-    public CommonResult<PageResult<ErpWarehouseRespVO>> getErpWarehousePage(@Valid ErpWarehousePageReqVO pageReqVO) {
-        PageResult<ErpWarehouseRespVO> pageResult = erpWarehouseService.getErpWarehousePage(pageReqVO);
+    public CommonResult<PageResult<ErpWarehouseDO> > getErpWarehousePage(@Valid ErpWarehousePageReqVO pageReqVO) {
+        PageResult<ErpWarehouseDO>  pageResult = erpWarehouseService.getErpWarehousePage(pageReqVO);
         return success(pageResult);
     }
 

zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/internalwarehouse/vo/InternalWarehouseEnableDisableReqVO.java

@@ -0,0 +1,19 @@
+package com.zt.plat.module.erp.controller.admin.erp.internalwarehouse.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import org.springframework.validation.annotation.Validated;
+
+
+import java.util.List;
+@Data
+@Schema(description = "ERP库位启用禁用 Request VO")
+@Validated
+public class InternalWarehouseEnableDisableReqVO {
+    @Schema(description = "主键列表")
+    @NotNull(message = "主键列表不能为空")
+    private List<String> ids;
+    @Schema(description = "状态")
+    private String isEnable;
+}