Merge branch 'refs/heads/dev' into test

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

@@ -199,4 +199,24 @@ public class ErpContractSaveReqVO {
     @Schema(description = "达到收款条件金额;销售合同，且类型为SAP02COSR必填")
     private BigDecimal payeeConditionAmount;
 
+    @Schema(description = "公司编号")
+    private Long companyId;
+
+    @Schema(description = "公司名称")
+    private String companyName;
+
+    @Schema(description = "部门编号")
+    private Long deptId;
+
+    @Schema(description = "部门名称")
+    private String deptName;
+
+    @Schema(description = "岗位编号")
+    private Long postId;
+
+    @Schema(description = "创建者")
+    private String creatorName;
+
+    @Schema(description = "更新者")
+    private String updaterName;
 }

zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpContractService.java

@@ -70,4 +70,12 @@ public interface ErpContractService {
     PageResult<ErpContractDO> getErpContractPage(ErpContractPageReqVO pageReqVO);
 
     void callErpRfcInterface();
+
+    /**
+     * 合同提交ERP
+     *
+     * @param erpContractVO ERP合同映射数据
+     * @return ERP合同映射
+     */
+    String submitErp(ErpContractSaveReqVO erpContractVO);
 }

zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/utils/ErpConfig.java

@@ -22,10 +22,10 @@ import static dm.jdbc.util.DriverUtil.log;
 @Configuration
 public class ErpConfig {
 
-    @Value("${erp.address}")
+    @Value("${erp.address:}")
     private String erpAddress;
 
-    @Value("${erp.sapsys}")
+    @Value("${erp.sapsys:}")
     private String sapsys;
 
     /**