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

yudao-module-erp/yudao-module-erp-api/src/main/java/cn/iocoder/yudao/module/erp/enums/ErrorCodeConstants.java

@@ -8,4 +8,11 @@ public interface ErrorCodeConstants {
     ErrorCode ERP_CUSTOMER_NOT_EXISTS = new ErrorCode(1_001_000_001, "ERP客商主数据不存在");
     ErrorCode ERP_MATERIAL_NOT_EXISTS = new ErrorCode(1_001_000_002, "ERP物料数据不存在");
     ErrorCode ERP_COMPANY_NOT_EXISTS = new ErrorCode(1_001_000_003, "ERP物料数据不存在");
+    ErrorCode ERP_BOM_NOT_EXISTS = new ErrorCode(1_001_000_003, "ERP物料数据不存在");
+    ErrorCode ERP_BOM_DETAIL_NOT_EXISTS = new ErrorCode(1_001_000_003, "ERP物料数据不存在");
+    ErrorCode ERP_PROCESS_NOT_EXISTS = new ErrorCode(1_001_000_003, "ERP物料数据不存在");
+    ErrorCode ERP_PROCESS_DETAIL_NOT_EXISTS = new ErrorCode(1_001_000_003, "ERP物料数据不存在");
+    ErrorCode ERP_FACTORY_NOT_EXISTS = new ErrorCode(1_001_000_003, "ERP物料数据不存在");
+    ErrorCode ERP_COSTCENTER_NOT_EXISTS = new ErrorCode(1_001_000_003, "ERP物料数据不存在");
+    ErrorCode ERP_PRODUCTIVE_VERSION_NOT_EXISTS = new ErrorCode(1_001_000_003, "ERP物料数据不存在");
 }

yudao-module-erp/yudao-module-erp-server/src/main/java/cn/iocoder/yudao/module/erp/ErpServerApplication.java

@@ -1,7 +1,6 @@
 package cn.iocoder.yudao.module.erp;
 
 import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 /**
  * ContractOrder 模块的启动类

yudao-module-erp/yudao-module-erp-server/src/main/java/cn/iocoder/yudao/module/erp/common/enums/OftenEnum.java

@@ -13,32 +13,60 @@ public class OftenEnum {
 
     //接口编号枚举
     public enum FuncnrEnum {
-        公司代码("001"),
-        工厂信息("002"),
-        客商信息("003"),
-        成本中心("004"),
-        内部订单("005"),
-        库位信息("006"),
-        采购组织("007"),
-        销售组织("008"),
-        合同信息("009"),
-        资产卡片("010"),
-        库存信息("011"),
-        辅组编码("012"),
-        生产订单("013"),
-        BOM清单("014"),
-        工艺路线("015"),
-        生产版本("016"),
-        生产投料("017"),
-        生产订单明细("018"),
-        库存明细("019"),
-        发票状态("020"),
-        物料数据("021");
+        公司代码("001", "BUKRS", ""),
+        工厂信息("002", "", ""),
+        客商信息("003", "PARTNER", "DATUM"),
+        成本中心("004", "", ""),
+        内部订单("005", "", ""),
+        库位信息("006", "", ""),
+        采购组织("007", "", ""),
+        销售组织("008", "", ""),
+        合同信息("009", "", ""),
+        资产卡片("010", "", ""),
+        库存信息("011", "", ""),
+        辅组编码("012", "", ""),
+        生产订单("013", "", ""),
+        BOM清单("014", "", ""),
+        工艺路线("015", "", ""),
+        生产版本("016", "", ""),
+        生产投料("017", "", ""),
+        生产订单明细("018", "", ""),
+        库存明细("019", "", ""),
+        发票状态("020", "", ""),
+        物料数据("021", "", "ERSDA");
 
-        public String funcnr = null;
+        private final String funcnr;
+        private final String datakey;
+        private final String datekey;
 
-        FuncnrEnum(String funcnr) {
+        FuncnrEnum(String funcnr, String datakey,String datekey) {
             this.funcnr = funcnr;
+            this.datakey = datakey;
+            this.datekey = datekey;
+        }
+
+        public String getFuncnr() {
+            return funcnr;
+        }
+
+        public String getDatakey() {
+            return datakey;
+        }
+
+        public String getDatekey() {
+            return datekey;
+        }
+    }
+
+    //接口编号枚举
+    public enum ModeTypeEnum {
+        供应商("K"),
+        客户("D");
+
+        public String modetype = null;
+
+        ModeTypeEnum(String modetype) {
+            this.modetype = modetype;
         }
     }
 }

yudao-module-erp/yudao-module-erp-server/src/main/java/cn/iocoder/yudao/module/erp/common/task/statisticstask.java

@@ -15,7 +15,7 @@ import org.springframework.transaction.annotation.Transactional;
  **/
 @Configuration
 @EnableScheduling
-public class statisticsTask {
+public class statisticstask {
 
     @Resource
     private ErpCompanyService erpCompanyService;

yudao-module-erp/yudao-module-erp-server/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/erp/ErpCompanyController.java

@@ -1,39 +1,36 @@
 package cn.iocoder.yudao.module.erp.controller.admin.erp;
 
+import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.pojo.vo.BatchDeleteReqVO;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
 import cn.iocoder.yudao.module.erp.controller.admin.erp.vo.ErpCompanyPageReqVO;
 import cn.iocoder.yudao.module.erp.controller.admin.erp.vo.ErpCompanyRespVO;
 import cn.iocoder.yudao.module.erp.controller.admin.erp.vo.ErpCompanySaveReqVO;
 import cn.iocoder.yudao.module.erp.dal.dataobject.erp.ErpCompanyDO;
 import cn.iocoder.yudao.module.erp.service.erp.ErpCompanyService;
-import org.springframework.web.bind.annotation.*;
-import jakarta.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.security.access.prepost.PreAuthorize;
-
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.Valid;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
 
-import jakarta.validation.*;
-import jakarta.servlet.http.*;
-import java.util.*;
 import java.io.IOException;
+import java.util.List;
 
-import cn.iocoder.yudao.framework.common.pojo.vo.BatchDeleteReqVO;
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 
-import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
-
-import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
-import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*;
-
 @Tag(name = "管理后台 - ERP公司")
 @RestController
-@RequestMapping("/admin/erp/company")
+@RequestMapping("/sply/erp-company")
 @Validated
 public class ErpCompanyController {
 
@@ -104,10 +101,10 @@ public class ErpCompanyController {
                         BeanUtils.toBean(list, ErpCompanyRespVO.class));
     }
 
-    @PostMapping("/callErpRfcInterface")
+    @PostMapping("/getErpCompanyTask")
     @Operation(summary = "定时获得erp更新公司")
     @PreAuthorize("@ss.hasPermission('sply:erp-company:query')")
-    public void callErpRfcInterface() {
+    public void getErpCompanyTask() {
         erpCompanyService.callErpRfcInterface();
     }