库位api,合同删除公司ID

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

@@ -1,10 +1,7 @@
 package com.zt.plat.module.erp.api;
 
 import com.zt.plat.framework.common.pojo.CommonResult;
-import com.zt.plat.module.erp.api.dto.ErpMaterialDTO;
+import com.zt.plat.module.erp.api.dto.*;
-import com.zt.plat.module.erp.api.dto.ErpProductiveVersionReqDTO;
-import com.zt.plat.module.erp.api.dto.ErpQueryReqDTO;
-import com.zt.plat.module.erp.api.dto.ErpSubmitReqDTO;
 import com.zt.plat.module.erp.enums.ApiConstants;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -39,4 +36,8 @@ public interface ErpExternalApi {
     @GetMapping(PREFIX + "/getMaterialUnit")
     @Operation(summary = "根据物料编码查询对应计量单位")
     CommonResult<String> getMaterialUnit(@RequestParam("downCenterNumber") String downCenterNumber);
+
+    @GetMapping(PREFIX + "/getErpWarehouse")
+    @Operation(summary = "根据id获得ERP库位")
+    CommonResult<ErpWarehouseDTO> getErpWarehouse(@RequestParam("id") Long id);
 }

zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/api/dto/ErpWarehouseDTO.java

@@ -0,0 +1,37 @@
+package com.zt.plat.module.erp.api.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Schema(description = "管理后台 - ERP库位 Response VO")
+@Data
+public class ErpWarehouseDTO {
+
+    @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "16847")
+    private Long id;
+
+    @Schema(description = "工厂编码;将查询参数存入")
+    private String factoryNumber;
+
+    @Schema(description = "工厂名称")
+    private String factoryName;
+
+    @Schema(description = "库位描述", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三")
+    private String name;
+
+    @Schema(description = "库位编码", requiredMode = Schema.RequiredMode.REQUIRED)
+    private String number;
+
+    @Schema(description = "类别")
+    private String type;
+
+    @Schema(description = "绑定库位名")
+    private String relName;
+
+    @Schema(description = "绑定库位编码")
+    private String relnumber;
+
+    @Schema(description = "是否启用")
+    private String isEnable;
+
+}

zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/api/ErpExternalApiImpl.java

@@ -2,19 +2,15 @@ package com.zt.plat.module.erp.api;
 
 import com.zt.plat.framework.common.pojo.CommonResult;
 import com.zt.plat.framework.common.util.object.BeanUtils;
-import com.zt.plat.module.erp.api.dto.ErpMaterialDTO;
+import com.zt.plat.module.erp.api.dto.*;
-import com.zt.plat.module.erp.api.dto.ErpProductiveVersionReqDTO;
+import com.zt.plat.module.erp.dal.dataobject.erp.ErpWarehouseDO;
-import com.zt.plat.module.erp.api.dto.ErpQueryReqDTO;
-import com.zt.plat.module.erp.api.dto.ErpSubmitReqDTO;
-import com.zt.plat.module.erp.controller.admin.erp.vo.ErpMaterialRespVO;
 import com.zt.plat.module.erp.service.erp.ErpMaterialService;
 import com.zt.plat.module.erp.service.erp.ErpProductiveVersionService;
+import com.zt.plat.module.erp.service.erp.ErpWarehouseService;
 import com.zt.plat.module.erp.utils.ErpConfig;
 import jakarta.annotation.Resource;
-import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Component;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.HashMap;
@@ -39,6 +35,8 @@ public class ErpExternalApiImpl implements ErpExternalApi {
     private ErpProductiveVersionService erpProductiveVersionService;
     @Resource
     private ErpMaterialService erpMaterialService;
+    @Resource
+    private ErpWarehouseService erpWarehouseService;
 
 
     @Override
@@ -64,4 +62,10 @@ public class ErpExternalApiImpl implements ErpExternalApi {
         String materialUnit = erpMaterialService.getMaterialUnit(materialNumber);
         return success(materialUnit);
     }
+
+    @Override
+    public CommonResult<ErpWarehouseDTO> getErpWarehouse(Long id) {
+        ErpWarehouseDO erpWarehouse = erpWarehouseService.getErpWarehouse(id);
+        return success(BeanUtils.toBean(erpWarehouse, ErpWarehouseDTO.class));
+    }
 }

zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/dataobject/erp/ErpContractDO.java

@@ -2,6 +2,7 @@ package com.zt.plat.module.erp.dal.dataobject.erp;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.zt.plat.framework.mybatis.core.dataobject.BaseDO;
+import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO;
 import lombok.*;
 
 import java.math.BigDecimal;
@@ -23,7 +24,7 @@ import java.time.LocalDate;
 /**
  * 支持业务基类继承：isBusiness=true 时继承 BusinessBaseDO，否则继承 BaseDO
  */
-public class ErpContractDO extends BaseDO {
+public class ErpContractDO extends BusinessBaseDO {
 
 
     /**
@@ -291,40 +292,5 @@ public class ErpContractDO extends BaseDO {
      */
     @TableField("PYEE_CND_AMT")
     private BigDecimal payeeConditionAmount;
-    /**
-     * 公司编号
-     */
-    @TableField("COMPANY_ID")
-    private Long companyId;
-    /**
-     * 公司名称
-     */
-    @TableField("COMPANY_NAME")
-    private String companyName;
-    /**
-     * 部门编号
-     */
-    @TableField("DEPT_ID")
-    private Long deptId;
-    /**
-     * 部门名称
-     */
-    @TableField("DEPT_NAME")
-    private String deptName;
-    /**
-     * 岗位编号
-     */
-    @TableField("POST_ID")
-    private Long postId;
-    /**
-     * 创建者
-     */
-    @TableField("CREATOR_NAME")
-    private String creatorName;
-    /**
-     * 更新者
-     */
-    @TableField("UPDATER_NAME")
-    private String updaterName;
 
 }