From cc9dcfec975f6a10121be67eac6d029d159b9460 Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期二, 20 十月 2026 14:19:42 +0800
Subject: [PATCH] feat:长期协议,不定期新增单位,标的物 历史导入标的物,根据接口查询 石煤机乙方总公司选总公司 和 分公司 银行流水加 时间拉取 流水数据 产品加拉取按钮 盖章件关闭控制

---
 platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ContractSubjectMatterExceVO.java                |    2 
 platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/BusinessCustomerController.java         |   15 
 platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ProductServiceImpl.java               |  267 +++++++++++
 platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/ProductService.java                        |    4 
 platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/BankStatementServiceImpl.java         |   52 ++
 platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/BusinessCustomerImportVo.java                   |   18 
 platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/ContractSubjectMatterService.java          |    5 
 platformx-business-finance-biz/src/main/resources/mapper/ProductMapper.xml                                                      |   10 
 platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/BusinessCustomerServiceImpl.java      |   57 ++
 platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ContractController.java                 |   12 
 platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/OutBoundController.java                 |   15 
 platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/ContractSubjectMatterAddDTO.java               |    3 
 platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractSubjectMatterServiceImpl.java |  316 +++++++++++++
 platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ContractSubjectMatterController.java    |    7 
 platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractServiceImpl.java              |  374 +++++++++++++--
 platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ContractSubjectMatter.java                  |    4 
 platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/OutBoundService.java                       |    2 
 platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/OutBoundServiceImpl.java              |   34 +
 platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ContractDetailVo.java                           |    6 
 platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/BankStatementQueryDTO.java                     |   16 
 platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/BankStatementController.java            |   28 
 platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/OutSubjectMatterAddDTO.java                    |    2 
 platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/ContractService.java                       |    2 
 platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ProductController.java                  |   20 
 platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/Product.java                                |    4 
 platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/BusinessCustomerService.java               |    6 
 platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/ContractOrderAddDTO.java                       |   40 +
 platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/BankStatementService.java                  |    3 
 platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ProductSelectVo.java                            |    2 
 29 files changed, 1,223 insertions(+), 103 deletions(-)

diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/BankStatementQueryDTO.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/BankStatementQueryDTO.java
new file mode 100644
index 0000000..16c8ead
--- /dev/null
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/BankStatementQueryDTO.java
@@ -0,0 +1,16 @@
+package com.by4cloud.platformx.business.dto;
+
+import lombok.Data;
+
+@Data
+public class BankStatementQueryDTO {
+
+	private String payBankAccName;
+
+	private String receiveBankAccName;
+
+	private String startDate;
+
+	private String endDate;
+
+}
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/ContractOrderAddDTO.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/ContractOrderAddDTO.java
new file mode 100644
index 0000000..66e99a7
--- /dev/null
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/ContractOrderAddDTO.java
@@ -0,0 +1,40 @@
+package com.by4cloud.platformx.business.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.persistence.Column;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+@Data
+public class ContractOrderAddDTO {
+
+	@Schema(description = "鐢叉柟id")
+	@JsonProperty("partyAId")
+	private Long partyAId;
+
+	@Schema(description = "鐢叉柟鍚嶇О")
+	@JsonProperty("partyA")
+	private String partyA;
+
+	private Long parentId;
+
+	@Schema(description = "鍚堝悓闄勪欢URL")
+	private String attachmentUrl;
+
+	@Schema(description = "鍚堝悓闄勪欢鍚嶇О")
+	private String attachmentName;
+
+	@Schema(description = "澶囨敞")
+	private String remark;
+
+	private List<ContractPaymentScheduleAddDTO> contractPaymentSchedule;
+
+	private List<ContractSubjectMatterAddDTO> contractSubjectMatter;
+
+}
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/ContractSubjectMatterAddDTO.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/ContractSubjectMatterAddDTO.java
index 241efb2..de2eb2e 100644
--- a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/ContractSubjectMatterAddDTO.java
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/ContractSubjectMatterAddDTO.java
@@ -12,6 +12,9 @@
 @Data
 public class ContractSubjectMatterAddDTO {
 
+	@Schema(description = "鏁版嵁ID")
+	private String dataId;
+
 	@Schema(description = "琛屽彿")
 	private String lineNo;
 
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/OutSubjectMatterAddDTO.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/OutSubjectMatterAddDTO.java
index 40268fc..3b2e44f 100644
--- a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/OutSubjectMatterAddDTO.java
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/OutSubjectMatterAddDTO.java
@@ -10,6 +10,8 @@
 
 	private Long id;
 
+	private String dataId;
+
 	private String lineNo;
 
 	@Schema(description = "鏍囩殑鐗╁悕绉�")
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ContractSubjectMatter.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ContractSubjectMatter.java
index 5101ab4..ffd628d 100644
--- a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ContractSubjectMatter.java
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ContractSubjectMatter.java
@@ -182,4 +182,8 @@
 	@Column(columnDefinition="text comment '澶囨敞'")
 	private String remarks;
 
+	@Schema(description = "鏁版嵁id宸ヤ笟娉电敤")
+	@Column(columnDefinition = "VARCHAR(64) comment '鏁版嵁id宸ヤ笟娉电敤'")
+	private String dataId;
+
 }
\ No newline at end of file
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/Product.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/Product.java
index 10d9844..3d5900d 100644
--- a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/Product.java
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/Product.java
@@ -59,6 +59,10 @@
     @Column(columnDefinition = "bigint default 0 comment '鐖禝D'")
     private Long parentId;
 
+	@Schema(description = "璁¢噺鍗曚綅")
+	@Column(columnDefinition = "VARCHAR(80) comment '璁¢噺鍗曚綅'")
+	private String unitName;
+
     @Schema(description = "鐖跺悕绉�")
     @Transient
     @TableField(exist = false)
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/BusinessCustomerImportVo.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/BusinessCustomerImportVo.java
new file mode 100644
index 0000000..e564750
--- /dev/null
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/BusinessCustomerImportVo.java
@@ -0,0 +1,18 @@
+package com.by4cloud.platformx.business.vo;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+
+@Data
+public class BusinessCustomerImportVo {
+
+	@ExcelProperty("瀹㈠晢鍚嶇О")
+	private String companyName;
+
+	@ExcelProperty("绀句細淇$敤浠g爜")
+	private String creditCode;
+
+	@ExcelProperty("ERP瀹㈠晢缂栫爜")
+	private String erpCompanyCode;
+
+}
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ContractDetailVo.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ContractDetailVo.java
index 0f1069b..7618c90 100644
--- a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ContractDetailVo.java
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ContractDetailVo.java
@@ -263,6 +263,12 @@
 	@Schema(description = "鏉℃涓昏鍐呭")
 	private String summary;
 
+	@Schema(description = "鍚堝悓绛惧瓧鐩栫珷闄勪欢URL")
+	private String lastAttachmentUrl;
+
+	@Schema(description = "鍚堝悓绛惧瓧鐩栫珷鍚嶇О")
+	private String lastAttachmentName;
+
 	private BigDecimal billingAmout;
 
 	private ContractInvoiceBipVo bipVo;
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ContractSubjectMatterExceVO.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ContractSubjectMatterExceVO.java
index ac01302..8a3a6a6 100644
--- a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ContractSubjectMatterExceVO.java
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ContractSubjectMatterExceVO.java
@@ -33,4 +33,6 @@
 	@ExcelProperty("鍑哄簱鏁伴噺*")
 	private String deliveredQuantity;
 
+	@ExcelProperty("鏍囩殑鐗╂槑缁咺D")
+	private String dataId;
 }
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ProductSelectVo.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ProductSelectVo.java
index 8ea78d3..9bfa87f 100644
--- a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ProductSelectVo.java
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ProductSelectVo.java
@@ -15,6 +15,8 @@
 
 	private String erpCode;
 
+	private String unitName;
+
 	private Long parentId;
 
 	private Integer childNum;
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/BankStatementController.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/BankStatementController.java
index 967ae28..95fc84d 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/BankStatementController.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/BankStatementController.java
@@ -6,8 +6,10 @@
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.by4cloud.platformx.business.dto.BankStatementQueryDTO;
 import com.by4cloud.platformx.business.dto.BankStatementUpdateDTO;
 import com.by4cloud.platformx.business.dto.BipQueryDTO;
+import com.by4cloud.platformx.business.dto.SyncPaymentRecepitDTO;
 import com.by4cloud.platformx.business.entity.BankStatement;
 import com.by4cloud.platformx.business.entity.BusinessCustomer;
 import com.by4cloud.platformx.common.core.util.R;
@@ -53,18 +55,20 @@
     /**
      * 鍒嗛〉鏌ヨ
      * @param page 鍒嗛〉瀵硅薄
-     * @param bankStatement 閾惰娴佹按
+     * @param queryDTO 閾惰娴佹按
      * @return
      */
     @Operation(summary = "鍒嗛〉鏌ヨ" , description = "鍒嗛〉鏌ヨ" )
     @GetMapping("/page" )
     @PreAuthorize("@pms.hasPermission('business_bankStatement_view')" )
-    public R getBankStatementPage(@ParameterObject Page page, @ParameterObject BankStatement bankStatement) {
+    public R getBankStatementPage(@ParameterObject Page page, @ParameterObject BankStatementQueryDTO queryDTO) {
 		if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smj) || StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjhw)) {
 			LambdaQueryWrapper<BankStatement> wrapper = Wrappers.lambdaQuery();
-			wrapper.like(StrUtil.isNotBlank(bankStatement.getPayBankAccName()),BankStatement::getPayBankAccName,bankStatement.getPayBankAccName());
-			wrapper.like(StrUtil.isNotBlank(bankStatement.getReceiveBankAccName()),BankStatement::getReceiveBankAccName,bankStatement.getReceiveBankAccName());
-			wrapper.orderByDesc(BankStatement::getCreateTime);
+			wrapper.like(StrUtil.isNotBlank(queryDTO.getPayBankAccName()),BankStatement::getPayBankAccName,queryDTO.getPayBankAccName());
+			wrapper.like(StrUtil.isNotBlank(queryDTO.getReceiveBankAccName()),BankStatement::getReceiveBankAccName,queryDTO.getReceiveBankAccName());
+			wrapper.ge(StrUtil.isNotBlank(queryDTO.getStartDate()),BankStatement::getTranDate,queryDTO.getStartDate()+" 00:00:00");
+			wrapper.le(StrUtil.isNotBlank(queryDTO.getEndDate()),BankStatement::getTranDate,queryDTO.getEndDate()+" 23:59:59");
+			wrapper.orderByDesc(BankStatement::getTranDate);
 			List<String> smjList = new ArrayList<>();
 			smjList.add(smj);
 			smjList.add(smjhw);
@@ -72,9 +76,11 @@
 			return R.ok(bankStatementService.page(page, wrapper));
 		}
         LambdaQueryWrapper<BankStatement> wrapper = Wrappers.lambdaQuery();
-		wrapper.like(StrUtil.isNotBlank(bankStatement.getPayBankAccName()),BankStatement::getPayBankAccName,bankStatement.getPayBankAccName());
-		wrapper.like(StrUtil.isNotBlank(bankStatement.getReceiveBankAccName()),BankStatement::getReceiveBankAccName,bankStatement.getReceiveBankAccName());
-        wrapper.orderByDesc(BankStatement::getCreateTime);
+		wrapper.like(StrUtil.isNotBlank(queryDTO.getPayBankAccName()),BankStatement::getPayBankAccName,queryDTO.getPayBankAccName());
+		wrapper.like(StrUtil.isNotBlank(queryDTO.getReceiveBankAccName()),BankStatement::getReceiveBankAccName,queryDTO.getReceiveBankAccName());
+		wrapper.ge(StrUtil.isNotBlank(queryDTO.getStartDate()),BankStatement::getTranDate,queryDTO.getStartDate()+" 00:00:00");
+		wrapper.le(StrUtil.isNotBlank(queryDTO.getEndDate()),BankStatement::getTranDate,queryDTO.getEndDate()+" 23:59:59");
+		wrapper.orderByDesc(BankStatement::getTranDate);
 		return R.ok(bankStatementService.pageByScope(page, wrapper));
     }
 
@@ -220,4 +226,10 @@
 	public R pageBip(@ParameterObject Page page, @ParameterObject BipQueryDTO queryDTO) {
 		return R.ok(bankStatementService.pageBip(page, queryDTO));
 	}
+
+	@GetMapping("/pullBankData" )
+	public R pullBankData(@ParameterObject SyncPaymentRecepitDTO queryDTO) {
+		return bankStatementService.pullBankData(queryDTO);
+	}
+
 }
\ No newline at end of file
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/BusinessCustomerController.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/BusinessCustomerController.java
index de18800..6a81f37 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/BusinessCustomerController.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/BusinessCustomerController.java
@@ -9,8 +9,11 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.by4cloud.platformx.business.dto.BusinessCustomerAddDTO;
 import com.by4cloud.platformx.business.entity.Product;
+import com.by4cloud.platformx.business.vo.BusinessCustomerImportVo;
 import com.by4cloud.platformx.business.vo.BusinessCustomerSelectVo;
+import com.by4cloud.platformx.business.vo.ProductExcelVO;
 import com.by4cloud.platformx.common.core.util.R;
+import com.by4cloud.platformx.common.excel.annotation.RequestExcel;
 import com.by4cloud.platformx.common.log.annotation.SysLog;
 import com.by4cloud.platformx.business.entity.BusinessCustomer;
 import com.by4cloud.platformx.business.service.BusinessCustomerService;
@@ -25,6 +28,7 @@
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Operation;
 import lombok.RequiredArgsConstructor;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.ArrayList;
@@ -229,4 +233,15 @@
 	public R queryMainBC(@PathVariable("companyName")String companyName) {
 		return R.ok(businessCustomerService.queryMainBC(companyName));
 	}
+
+	/**
+	 * 瀵煎叆瀹㈠晢
+	 * @param excelVOList
+	 * @param bindingResult
+	 * @return
+	 */
+	@PostMapping("/importBusinessCustomer")
+	public R importBusinessCustomer(@RequestExcel List<BusinessCustomerImportVo> excelVOList, BindingResult bindingResult) {
+		return businessCustomerService.importBusinessCustomer(excelVOList, bindingResult);
+	}
 }
\ No newline at end of file
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ContractController.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ContractController.java
index 500bb45..c61aef6 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ContractController.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ContractController.java
@@ -163,6 +163,7 @@
 	public R list(@ParameterObject Contract contract) {
 		return R.ok(contractService.listByScope(Wrappers.<Contract>lambdaQuery().eq(Contract::getContractStatus,2)
 				.eq(ObjUtil.isNotNull(contract.getPartyAId()),Contract::getPartyAId,contract.getPartyAId())
+				.eq(ObjUtil.isNotNull(contract.getAmount()),Contract::getAmount,0)
 				.orderByDesc(Contract::getCreateTime)));
 	}
 
@@ -521,4 +522,15 @@
 		contractService.takeEffect(id);
 		return R.ok();
 	}
+
+	/**
+	 * 鏂板闀挎湡鍗忚璁㈠崟
+	 * @return R
+	 */
+	@Operation(summary = "鏂板闀挎湡鍗忚璁㈠崟" , description = "鏂板闀挎湡鍗忚璁㈠崟" )
+	@PostMapping("/addContractOrder")
+	@SysLog("鏂板闀挎湡鍗忚璁㈠崟" )
+	public R addContractOrder(@RequestBody ContractOrderAddDTO addDTO) {
+		return contractService.addContractOrder(addDTO);
+	}
 }
\ No newline at end of file
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ContractSubjectMatterController.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ContractSubjectMatterController.java
index 2d49bad..d3a7c29 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ContractSubjectMatterController.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ContractSubjectMatterController.java
@@ -12,6 +12,7 @@
 import com.by4cloud.platformx.common.excel.annotation.RequestExcel;
 import com.by4cloud.platformx.common.log.annotation.SysLog;
 import com.by4cloud.platformx.business.service.ContractSubjectMatterService;
+import com.by4cloud.platformx.common.security.annotation.Inner;
 import org.springframework.security.access.prepost.PreAuthorize;
 import com.by4cloud.platformx.common.excel.annotation.ResponseExcel;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
@@ -151,4 +152,10 @@
 	public R importSubjectMatter(@RequestExcel List<SubjectMatterExcelVO> excelVOList, BindingResult bindingResult) {
 		return contractSubjectMatterService.importSubjectMatter(excelVOList, bindingResult);
 	}
+
+	@Inner(value = false)
+	@GetMapping("/smjProduct/{erpCode}" )
+	public R smjProduct(@PathVariable("erpCode" ) String erpCode) {
+		return contractSubjectMatterService.smjProduct(erpCode);
+	}
 }
\ No newline at end of file
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/OutBoundController.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/OutBoundController.java
index a24f8af..41be04b 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/OutBoundController.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/OutBoundController.java
@@ -99,7 +99,20 @@
 		return outBoundService.addContractOut(addDTO);
 	}
 
-    /**
+	/**
+	 * 鏂板鍚堝悓鍑哄簱璁板綍-鐭冲伐娉�
+	 * @param addDTO 鍚堝悓鍑哄簱璁板綍
+	 * @return R
+	 */
+	@Operation(summary = "鏂板鍚堝悓鍑哄簱璁板綍-鐭冲伐娉�" , description = "鏂板鍚堝悓鍑哄簱璁板綍-鐭冲伐娉�" )
+	@SysLog("鏂板鍚堝悓鍑哄簱璁板綍-鐭冲伐娉�" )
+	@PostMapping("/addContractOutSgb")
+	public R addContractOutSgb(@RequestBody OutBoundAddDTO addDTO) {
+		return outBoundService.addContractOutSgb(addDTO);
+	}
+
+
+	/**
      * 淇敼EPR鍑哄簱璁板綍
      * @param outBound EPR鍑哄簱璁板綍
      * @return R
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ProductController.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ProductController.java
index f4fdbac..8c3e609 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ProductController.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ProductController.java
@@ -221,7 +221,7 @@
 	}
 
 	/**
-	 * 瀵煎叆閮ㄩ棬
+	 * 瀵煎叆浜у搧
 	 * @param excelVOList
 	 * @param bindingResult
 	 * @return
@@ -240,4 +240,22 @@
 	public R syncSMJByDate(@ParameterObject SyncProductDTO dto) {
 		return productService.syncSMJByDate(dto);
 	}
+
+	/**
+	 * 鐭崇叅鏈轰骇鍝佸悓姝�
+	 * @return
+	 */
+	@GetMapping("/pullProductData")
+	public R pullProductData() {
+		return productService.pullProductData();
+	}
+
+	/**
+	 * 鐭崇叅鏈轰骇鍝佸悓姝�
+	 * @return
+	 */
+	@GetMapping("/pullProductPage")
+	public R pullProductPage() {
+		return productService.pullProductPage();
+	}
 }
\ No newline at end of file
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/BankStatementService.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/BankStatementService.java
index 29bff5f..5b4cc57 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/BankStatementService.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/BankStatementService.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.by4cloud.platformx.business.dto.BankStatementUpdateDTO;
 import com.by4cloud.platformx.business.dto.BipQueryDTO;
+import com.by4cloud.platformx.business.dto.SyncPaymentRecepitDTO;
 import com.by4cloud.platformx.business.entity.BankStatement;
 import com.by4cloud.platformx.common.core.util.R;
 import com.by4cloud.platformx.common.data.mybatis.IIService;
@@ -24,4 +25,6 @@
 	Page pageBip(Page page, BipQueryDTO queryDTO);
 
 	R saveAndPush(BankStatementUpdateDTO updateDTO);
+
+	R pullBankData(SyncPaymentRecepitDTO queryDTO);
 }
\ No newline at end of file
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/BusinessCustomerService.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/BusinessCustomerService.java
index 969f5dc..97833f1 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/BusinessCustomerService.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/BusinessCustomerService.java
@@ -2,9 +2,13 @@
 
 import com.by4cloud.platformx.business.dto.BusinessCustomerAddDTO;
 import com.by4cloud.platformx.business.entity.BusinessCustomer;
+import com.by4cloud.platformx.business.vo.BusinessCustomerImportVo;
 import com.by4cloud.platformx.business.vo.BusinessCustomerMainVo;
 import com.by4cloud.platformx.common.core.util.R;
 import com.by4cloud.platformx.common.data.mybatis.IIService;
+import org.springframework.validation.BindingResult;
+
+import java.util.List;
 
 public interface BusinessCustomerService extends IIService<BusinessCustomer> {
 
@@ -13,4 +17,6 @@
 	BusinessCustomerMainVo queryMainBC(String companyName);
 
     R saveCustomerSgb(BusinessCustomerAddDTO addDTO);
+
+	R importBusinessCustomer(List<BusinessCustomerImportVo> excelVOList, BindingResult bindingResult);
 }
\ No newline at end of file
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/ContractService.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/ContractService.java
index a2be64b..46359c1 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/ContractService.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/ContractService.java
@@ -104,4 +104,6 @@
 	R updContractHisNoCenter(ContractUpdateDTO updateDTO);
 
 	R addContractNoSgb(ContractAddDTO addDTO);
+
+	R addContractOrder(ContractOrderAddDTO addDTO);
 }
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/ContractSubjectMatterService.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/ContractSubjectMatterService.java
index 72190b0..358d133 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/ContractSubjectMatterService.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/ContractSubjectMatterService.java
@@ -1,5 +1,6 @@
 package com.by4cloud.platformx.business.service;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.by4cloud.platformx.business.entity.ContractSubjectMatter;
 import com.by4cloud.platformx.business.vo.SubjectMatterExcelVO;
@@ -15,4 +16,8 @@
     R selectSubjectMatter(Long contractId);
 
     R importSubjectMatter(List<SubjectMatterExcelVO> excelVOList, BindingResult bindingResult);
+
+	R smjProduct(String erpCode);
+
+	JSONObject syncProductBySMJ(String tenant1, String materialCode);
 }
\ No newline at end of file
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/OutBoundService.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/OutBoundService.java
index 64f62fc..44b2e27 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/OutBoundService.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/OutBoundService.java
@@ -12,4 +12,6 @@
     R addContractOut(OutBoundAddDTO addDTO);
 
 	R delOutBound(String batchNumber);
+
+    R addContractOutSgb(OutBoundAddDTO addDTO);
 }
\ No newline at end of file
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/ProductService.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/ProductService.java
index 7916375..8a3aa7d 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/ProductService.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/ProductService.java
@@ -30,4 +30,8 @@
     R syncSMJByDate(SyncProductDTO dto);
 
     Page pageScope(Page page, Product product);
+
+	R pullProductData();
+
+    R pullProductPage();
 }
\ No newline at end of file
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/BankStatementServiceImpl.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/BankStatementServiceImpl.java
index e71712e..0221b3f 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/BankStatementServiceImpl.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/BankStatementServiceImpl.java
@@ -18,6 +18,7 @@
 import com.by4cloud.platformx.business.dto.BankStatementUpdateDTO;
 import com.by4cloud.platformx.business.dto.BipQueryDTO;
 import com.by4cloud.platformx.business.dto.PaymentConfirmAddDTO;
+import com.by4cloud.platformx.business.dto.SyncPaymentRecepitDTO;
 import com.by4cloud.platformx.business.entity.*;
 import com.by4cloud.platformx.business.mapper.*;
 import com.by4cloud.platformx.business.service.BankStatementService;
@@ -76,6 +77,27 @@
 
 	@Value("${erp.sgb}")
 	private String sgbErp;
+
+	@Value("${dept.smj}")
+	private String smj;
+
+	@Value("${dept.smjsc}")
+	private String smjsc;
+
+	@Value("${dept.smjzt}")
+	private String smjzt;
+
+	@Value("${dept.smjhw}")
+	private String smjhw;
+
+	@Value("${dept.jxc}")
+	private String jxc;
+
+	@Value("${dept.tfgs}")
+	private String tfgs;
+
+	@Value("${dept.ymj}")
+	private String ymj;
 
 	@Override
 	public R edit(BankStatementUpdateDTO updateDTO) {
@@ -667,4 +689,34 @@
 
 		return pushSaveCollection(statement, item);
 	}
+
+	@Override
+	public R pullBankData(SyncPaymentRecepitDTO queryDTO) {
+		if (StrUtil.isBlank(queryDTO.getStartDate())||StrUtil.isBlank(queryDTO.getEndDate())){
+			return R.failed("璇烽�夋嫨浜ゆ槗鏃堕棿鑼冨洿");
+		}
+		if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smj) ||
+				StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjhw)) {
+			queryDTO.setBipCode("10860");
+		}
+		if ( StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjsc) ) {
+			queryDTO.setBipCode("1086005");
+		}
+		if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjzt)) {
+			queryDTO.setBipCode("10860");
+		}
+		if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", sgb)) {
+			queryDTO.setBipCode("10802 ");
+		}
+		if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", ymj)) {
+			queryDTO.setBipCode("10668");
+		}
+		if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", tfgs)) {
+			queryDTO.setBipCode("10861");
+		}
+		if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", jxc)) {
+			queryDTO.setBipCode("10801");
+		}
+		return paymentConfirmService.syncPaymentRecepit(queryDTO);
+	}
 }
\ No newline at end of file
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/BusinessCustomerServiceImpl.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/BusinessCustomerServiceImpl.java
index fe543dc..19e3f92 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/BusinessCustomerServiceImpl.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/BusinessCustomerServiceImpl.java
@@ -1,5 +1,6 @@
 package com.by4cloud.platformx.business.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 
 import cn.hutool.core.util.ObjUtil;
@@ -12,16 +13,17 @@
 import com.by4cloud.platformx.business.mapper.BipViewMapper;
 import com.by4cloud.platformx.business.mapper.BusinessCustomerMapper;
 import com.by4cloud.platformx.business.service.BusinessCustomerService;
-import com.by4cloud.platformx.business.vo.BankNameVo;
-import com.by4cloud.platformx.business.vo.BusinessCustomerMainVo;
-import com.by4cloud.platformx.business.vo.CustBankVo;
-import com.by4cloud.platformx.business.vo.CustInfoVo;
+import com.by4cloud.platformx.business.vo.*;
 import com.by4cloud.platformx.common.core.util.R;
+import com.by4cloud.platformx.common.excel.vo.ErrorMessage;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
+import org.springframework.validation.BindingResult;
 
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 /**
  * 瀹㈠晢淇℃伅
@@ -127,6 +129,7 @@
 			return R.failed("瀹㈠晢宸插瓨鍦�");
 		}
 		BusinessCustomer customer = new BusinessCustomer();
+		customer.setErpCompanyCode(addDTO.getErpCompanyCode());
 		log.info("涓绘暟鎹煡璇}淇℃伅",addDTO.getCompanyName());
 		CustInfoVo custInfo = bipViewMapper.selectBaseInfoByCustName(addDTO.getCompanyName());
 		if (ObjUtil.isNotNull(custInfo)){
@@ -166,4 +169,50 @@
 		}
 		return R.failed("涓绘暟鎹鍟嗕俊鎭笉瀛樺湪");
 	}
+
+	@Override
+	public R importBusinessCustomer(List<BusinessCustomerImportVo> excelVOList, BindingResult bindingResult) {
+		List<ErrorMessage> errorMessageList = (List<ErrorMessage>) bindingResult.getTarget();
+		if (CollUtil.isNotEmpty(excelVOList)) {
+			Long line = 0L;
+			for (BusinessCustomerImportVo excelVO : excelVOList
+			) {
+				Set<String> errorMsg = new HashSet<>();
+				if (StrUtil.isBlank(excelVO.getCreditCode())||StrUtil.isBlank(excelVO.getErpCompanyCode())){
+					errorMsg.add(excelVO.getCompanyName()+"绀句細淇$敤浠g爜鎴朎RP瀹㈡埛缂栫爜涓嶈兘涓虹┖");
+					errorMessageList.add(new ErrorMessage(line++, errorMsg));
+					continue;
+				}
+				BusinessCustomer customer = baseMapper.selectOne(Wrappers.<BusinessCustomer>lambdaQuery()
+						.eq(BusinessCustomer::getCreditCode, excelVO.getCreditCode())
+						.last("limit 1"));
+				if (ObjUtil.isNull(customer)) {
+					customer = BeanUtil.copyProperties(excelVO, BusinessCustomer.class);
+					CustInfoVo custInfo = bipViewMapper.selectBaseInfoByCustName(excelVO.getCompanyName());
+					if (ObjUtil.isNotNull(custInfo)) {
+						customer.setCreditCode(custInfo.getCertificateId());
+						customer.setRegisterName(custInfo.getCustName());
+						customer.setLegalPerson(custInfo.getLegalPerson());
+						customer.setAddress(custInfo.getRegistrationAddress());
+						customer.setProvince(customer.getCreditCode().substring(2, 4));
+						customer.setInvoiceType("01");
+						log.info("{}涓绘暟鎹煡璇㈠悕绉般�佹硶浜恒�佸湴鍧�銆佷俊鐢ㄧ爜淇℃伅鎴愬姛", excelVO.getCompanyName());
+						List<CustBankVo> bankVoList = bipViewMapper.selectBankByCustName(excelVO.getCompanyName());
+						if (CollUtil.isNotEmpty(bankVoList)) {
+							customer.setBankAccount(bankVoList.get(0).getBankAccount());
+							log.info("{}涓绘暟鎹煡璇㈤摱琛屽崱鍙蜂俊鎭垚鍔�", excelVO.getCompanyName());
+							List<BankNameVo> bankNameVoList = bipBanklViewMapper.selectBankByCode(bankVoList.get(0).getBankName());
+							if (CollUtil.isNotEmpty(bankNameVoList)) {
+								customer.setBankName(bankNameVoList.get(0).getBankNameName());
+								log.info("{}涓绘暟鎹煡璇㈤摱琛屽悕绉颁俊鎭垚鍔�", excelVO.getCompanyName());
+							}
+						}
+						customer.setRegisterName(custInfo.getCustName());
+						baseMapper.insert(customer);
+					}
+				}
+			}
+		}
+		return R.ok();
+	}
 }
\ No newline at end of file
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractServiceImpl.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractServiceImpl.java
index b03c778..4019a40 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractServiceImpl.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractServiceImpl.java
@@ -29,12 +29,14 @@
 import com.by4cloud.platformx.business.mapper.*;
 import com.by4cloud.platformx.business.service.ContractPaymentScheduleProcessService;
 import com.by4cloud.platformx.business.service.ContractService;
+import com.by4cloud.platformx.business.service.ContractSubjectMatterService;
 import com.by4cloud.platformx.business.utils.BatchInsertListener;
 import com.by4cloud.platformx.business.utils.ItemGeneratorUtil;
 import com.by4cloud.platformx.business.utils.NetworkFileToBase64;
 import com.by4cloud.platformx.business.vo.*;
 import com.by4cloud.platformx.common.core.util.R;
 import com.by4cloud.platformx.common.data.datascope.DataScope;
+import com.by4cloud.platformx.common.excel.vo.ErrorMessage;
 import com.by4cloud.platformx.common.security.util.SecurityUtils;
 import com.by4cloud.platformx.flow.task.dto.ProcessInstanceParamDto;
 import com.deepoove.poi.XWPFTemplate;
@@ -93,6 +95,8 @@
 	private final ContractPaymentScheduleProcessService processService;
 	private final ContractSubjectMatterChangeMapper changeMapper;
 	private final ContractApprovalMapper contractApprovalMapper;
+	private final TaxCodeMapper taxCodeMapper;
+	private final ContractSubjectMatterService contractSubjectMatterService;
 
 	@Value("${erp.ymj}")
 	private String ymjErp;
@@ -157,8 +161,10 @@
 	@Override
 	public R add(ContractAddDTO addDTO) {
 		Contract contract = BeanUtil.copyProperties(addDTO, Contract.class);
-		contract.setPartyBId(SecurityUtils.getUser().getCompId());
-		contract.setPartyB(SecurityUtils.getUser().getCompName());
+		if (!StrUtil.equals(smjsc,SecurityUtils.getUser().getCompId()+"")&&!StrUtil.equals(smjzt,SecurityUtils.getUser().getCompId()+"")) {
+			contract.setPartyBId(SecurityUtils.getUser().getCompId());
+			contract.setPartyB(SecurityUtils.getUser().getCompName());
+		}
 		if (StrUtil.isEmpty(addDTO.getPartyA())) {
 			BusinessCustomer bc = businessCustomerMapper.selectById(addDTO.getPartyAId());
 			if (ObjUtil.isNotNull(bc)) {
@@ -1915,6 +1921,10 @@
 		if (CollUtil.isEmpty(addDTO.getContractSubjectMatter())) {
 			return R.failed("璇锋坊鍔犳爣鐨勭墿");
 		}
+		if (addDTO.getContractSubjectMatter().stream().anyMatch(contractSubjectMatterAddDTO -> StrUtil.isBlank(contractSubjectMatterAddDTO.getDataId())&&
+				StrUtil.isBlank(contractSubjectMatterAddDTO.getMaterialCode()))){
+			return R.failed("鏍囩殑鐗╃殑dataId鍜宮aterialCode涓嶈兘鍚屾椂涓虹┖");
+		}
 		if (CollUtil.isEmpty(addDTO.getContractPaymentSchedule())) {
 			return R.failed("璇锋坊鍔犱粯娆鹃樁娈垫垨浠樻闃舵缂哄皯");
 		}
@@ -1969,23 +1979,18 @@
 			addDTO.getContractSubjectMatter().stream().forEach(contractSubjectMatterAddDTO -> {
 				ContractSubjectMatter subjectMatter = BeanUtil.copyProperties(contractSubjectMatterAddDTO, ContractSubjectMatter.class);
 				subjectMatter.setContractId(contract.getId());
-				if (StrUtil.isNotBlank(subjectMatter.getMaterialCode())){
-					Product product = productMapper.selectOne(Wrappers.<Product>lambdaQuery().eq(Product::getErpCode,subjectMatter.getMaterialCode())
-							.last("limit 1"));
-					if (ObjUtil.isNotNull(product)){
-						subjectMatter.setMaterialInternalName(product.getId()+"");
-					}
-					if (ObjUtil.isNull(product)){
-						product = new Product();
-						product.setParentId(2101559148831944705L);
-						product.setProductName(subjectMatter.getMaterialInternalName());
-						product.setErpCode(subjectMatter.getMaterialCode());
-						product.setProductType(subjectMatter.getSpecification());
-						product.setTaxCode("1090117040000000000");
-						product.setTaxClass("娉�");
-						productMapper.insert(product);
-						subjectMatter.setMaterialInternalName(product.getId()+"");
-					}
+				Product product = productMapper.selectOne(Wrappers.<Product>lambdaQuery().eq(Product::getErpCode,subjectMatter.getMaterialCode())
+						.last("limit 1"));
+				if (ObjUtil.isNull(product)){
+					product = new Product();
+					product.setParentId(2101559148831944705L);
+					product.setProductName(subjectMatter.getMaterialInternalName());
+					product.setErpCode(subjectMatter.getMaterialCode());
+					product.setProductType(subjectMatter.getSpecification());
+					product.setTaxCode("1090117040000000000");
+					product.setTaxClass("娉�");
+					productMapper.insert(product);
+					subjectMatter.setMaterialInternalName(product.getId()+"");
 				}
 				subjectMatter.setDeliveredQuantity(new BigDecimal("0"));
 				subjectMatter.setDeliveryStatus(0);
@@ -2059,6 +2064,10 @@
 	public R updateContractSgb(ContractUpdateDTO updateDTO) {
 		if (CollUtil.isEmpty(updateDTO.getContractSubjectMatter())) {
 			return R.failed("璇锋坊鍔犳爣鐨勭墿");
+		}
+		if (updateDTO.getContractSubjectMatter().stream().anyMatch(contractSubjectMatterAddDTO -> StrUtil.isBlank(contractSubjectMatterAddDTO.getDataId())&&
+				StrUtil.isBlank(contractSubjectMatterAddDTO.getMaterialCode()))){
+			return R.failed("鏍囩殑鐗╃殑dataId鍜宮aterialCode涓嶈兘鍚屾椂涓虹┖");
 		}
 		if (CollUtil.isEmpty(updateDTO.getContractPaymentSchedule())) {
 			return R.failed("璇锋坊鍔犱粯娆鹃樁娈垫垨浠樻闃舵缂哄皯");
@@ -2283,6 +2292,15 @@
 
 		// 5. 鎷兼帴杩斿洖
 		return "ZB-GYB-" + dateStr + seqStr;
+	}
+
+	public String generateBranchContractNo(String mainNo) {
+		String key = mainNo;
+		Long sequence = redisTemplate.opsForValue().increment(key, 1);
+		// 4. 鏍煎紡鍖栧簭鍒楀彿锛屼笉瓒�6浣嶅墠琛�0
+		String seqStr = String.format("%04d", sequence);
+		// 5. 鎷兼帴杩斿洖
+		return mainNo +"-"+ seqStr;
 	}
 
 	@Override
@@ -2778,9 +2796,25 @@
 					errList.add(map);
 					continue;
 				}
-				BusinessCustomer bc = businessCustomerMapper.selectOne(Wrappers.<BusinessCustomer>lambdaQuery()
-						.eq(BusinessCustomer::getCompanyName, contractExceVO.getBcErpCode())
-						.last("limit 1"));
+				BusinessCustomer bc = null;
+				if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smj) || StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjsc)
+						|| StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjzt)|| StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjhw)){
+					List<String> smjList = new ArrayList<>();
+					smjList.add(smj);
+					smjList.add(smjsc);
+					smjList.add(smjzt);
+					smjList.add(smjhw);
+					bc = businessCustomerMapper.selectOne(Wrappers.<BusinessCustomer>lambdaQuery()
+							.eq(BusinessCustomer::getCompanyName, contractExceVO.getBcErpCode())
+							.in(BusinessCustomer::getCompId, smjList)
+							.last("limit 1"));
+				}else {
+					bc = businessCustomerMapper.selectOne(Wrappers.<BusinessCustomer>lambdaQuery()
+							.eq(BusinessCustomer::getCompanyName, contractExceVO.getBcErpCode())
+							.eq(BusinessCustomer::getCompId,SecurityUtils.getUser().getCompId())
+							.last("limit 1"));
+				}
+
 				if (ObjUtil.isNull(bc)) {
 					Map<String, String> map = new HashMap<String, String>();
 					map.put("lineNum", "绗�" + (i + 1) + "琛�");
@@ -2864,11 +2898,15 @@
 				baseMapper.insert(contract);
 				BigDecimal remainAmount = ObjUtil.isNotNull(contract.getPaidAmount()) ? contract.getPaidAmount() : new BigDecimal("0");
 				List<ContractSubjectMatterExceVO> resultMatter = matterList.stream().filter(item ->
-						StrUtil.isNotBlank(item.getMaterialCode()) &&
 								StrUtil.equals(item.getContractNo(), contract.getContractNo())).collect(Collectors.toList());
 				if (CollUtil.isNotEmpty(resultMatter)) {
+					log.info("鍚堝悓缂栧彿锛歿},鏍囩殑鐗╀釜鏁�:{}",contract.getContractNo(),resultMatter.size());
 					for (ContractSubjectMatterExceVO subMatEx : resultMatter
 					) {
+						if (StrUtil.isBlank(subMatEx.getDataId())&&StrUtil.isBlank(subMatEx.getMaterialCode())){
+							log.error("鍚堝悓缂栧彿锛歿},鏍囩殑鐗�:{}鏍囩殑鐗ヾataId鍜宮aterialCode鍚屾椂涓虹┖",contract.getContractNo(),subMatEx.getMaterialName());
+							continue;
+						}
 						ContractSubjectMatter subjectMatter = BeanUtil.copyProperties(subMatEx, ContractSubjectMatter.class);
 						subjectMatter.setContractId(contract.getId());
 						subjectMatter.setDeliveredQuantity(StrUtil.isBlank(subMatEx.getDeliveredQuantity())
@@ -2878,25 +2916,13 @@
 								: subjectMatter.getRemainingQuantity().compareTo(new BigDecimal("0")) > 0 ? 1 : 2);
 						subjectMatter.setLineNo(ItemGeneratorUtil.nextId());
 						contractSubjectMatterMapper.insert(subjectMatter);
-//						if (subjectMatter.getDeliveredQuantity().compareTo(new BigDecimal("0")) > 0) {
-//							//鍑哄簱鍗�
-//							ContractOutBound outBound = new ContractOutBound();
-//							outBound.setBusGuestId(contract.getPartyAId());
-//							outBound.setBusGuestName(contract.getPartyA());
-//							outBound.setContractId(contract.getId());
-//							outBound.setContractName(contract.getContractName());
-//							outBound.setInvoiceNum(new BigDecimal("0"));
-//							outBound.setInvoiceStatus("0");
-//							outBound.setOutBoundTime(new Date());
-//							outBound.setOutBoundNum(subjectMatter.getDeliveredQuantity());
-//							outBound.setSubjectMatterName(subjectMatter.getMaterialInternalName());
-//							outBound.setSubjectMatterCode(subjectMatter.getMaterialCode());
-//							contractOutBoundMapper.insert(outBound);
-//							if (contract.getBillingAmout().compareTo(new BigDecimal("0")) == 0) {
-//								contract.setBillingStatus("2");
-//								baseMapper.updateById(contract);
-//							}
-//						}
+						if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smj) || StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjsc) ||
+								StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjzt)||
+								StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjhw)) {
+							if (StrUtil.isBlank(subMatEx.getMaterialCode())) {
+								handleProduct(subMatEx.getMaterialCode());
+							}
+						}
 
 					}
 				}
@@ -2957,6 +2983,154 @@
 			return R.failed("鏂囦欢瑙f瀽澶辫触: " + e.getMessage());
 		}
 		return R.ok();
+	}
+
+	private void handleProduct(String productCode) {
+		if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smj) || StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjhw)) {
+			List<String> smjList = new ArrayList<>();
+			smjList.add(smj);
+			smjList.add(smjhw);
+			Product one = productMapper.selectOne(Wrappers.<Product>lambdaQuery()
+					.eq(Product::getErpCode, productCode)
+					.in(Product::getCompId, smjList)
+					.last("limit 1"));
+			if (ObjUtil.isNull(one)) {
+				JSONObject object = contractSubjectMatterService.syncProductBySMJ("tenant1", productCode);
+				if (ObjUtil.isNotNull(object)) {
+					Product productClass = productMapper.selectOne(Wrappers.<Product>lambdaQuery()
+							.eq(Product::getProductName, object.getString("itemClassName"))
+							.eq(Product::getCompId, "2089995177814495234")
+							.last("limit 1")
+					);
+					if (ObjUtil.isNull(productClass)) {
+						log.info("浜у搧鍒嗙被锛歿}涓嶅瓨鍦�", object.getString("itemClassName"));
+						productClass = new Product();
+						productClass.setProductName(object.getString("itemClassName"));
+						productClass.setErpCode(object.getString("itemClassName"));
+						productClass.setParentId(0L);
+						productClass.setCompId(2089995177814495234L);
+						TaxCode taxCode = taxCodeMapper.selectOne(Wrappers.<TaxCode>lambdaQuery().eq(TaxCode::getBm, object.getString("tfTaxClass")).last("limit 1"));
+						if (ObjUtil.isNotNull(taxCode)) {
+							productClass.setTaxClass(taxCode.getSphwjc());
+							productClass.setTaxRate(Double.valueOf(taxCode.getSl().replace("%", "")));
+						}
+						productMapper.insert(productClass);
+						log.info("浜у搧鍒嗙被锛歿}鏂板鎴愬姛", object.getString("itemClassName"));
+					}
+
+					log.info("浜у搧锛歿}涓嶅瓨鍦�", object.getString("itemNo"));
+					Product productNew = new Product();
+					productNew.setProductName(object.getString("note"));
+					productNew.setErpCode(object.getString("itemNo"));
+					productNew.setProductType(object.getString("grade"));
+					productNew.setUnitName(object.getString("unitName"));
+					productNew.setCompId(2089995177814495234L);
+					productNew.setParentId(productClass.getId());
+					TaxCode taxCode = taxCodeMapper.selectOne(Wrappers.<TaxCode>lambdaQuery().eq(TaxCode::getBm, object.getString("tfTaxClass")).last("limit 1"));
+					if (ObjUtil.isNotNull(taxCode)) {
+						productClass.setTaxClass(taxCode.getSphwjc());
+						productClass.setTaxRate(Double.valueOf(taxCode.getSl().replace("%", "")));
+					}
+					productMapper.insert(productNew);
+					log.info("浜у搧锛歿}鏂板鎴愬姛", object.getString("itemNo"));
+				}
+
+			}
+
+		}
+		if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjsc)) {
+			Product one = productMapper.selectOne(Wrappers.<Product>lambdaQuery()
+					.eq(Product::getErpCode, productCode)
+					.eq(Product::getCompId, smjsc)
+					.last("limit 1"));
+			if (ObjUtil.isNull(one)) {
+				JSONObject object = contractSubjectMatterService.syncProductBySMJ("tenant2", productCode);
+				if (ObjUtil.isNotNull(object)) {
+					Product productClass = productMapper.selectOne(Wrappers.<Product>lambdaQuery()
+							.eq(Product::getProductName, object.getString("itemClassName"))
+							.eq(Product::getCompId, "2089996921978040321")
+							.last("limit 1")
+					);
+					if (ObjUtil.isNull(productClass)) {
+						log.info("浜у搧鍒嗙被锛歿}涓嶅瓨鍦�", object.getString("itemClassName"));
+						productClass = new Product();
+						productClass.setProductName(object.getString("itemClassName"));
+						productClass.setErpCode(object.getString("itemClassName"));
+						productClass.setParentId(0L);
+						productClass.setCompId(2089996921978040321L);
+						TaxCode taxCode = taxCodeMapper.selectOne(Wrappers.<TaxCode>lambdaQuery().eq(TaxCode::getBm, object.getString("tfTaxClass")).last("limit 1"));
+						if (ObjUtil.isNotNull(taxCode)) {
+							productClass.setTaxClass(taxCode.getSphwjc());
+							productClass.setTaxRate(Double.valueOf(taxCode.getSl().replace("%", "")));
+						}
+						productMapper.insert(productClass);
+						log.info("浜у搧鍒嗙被锛歿}鏂板鎴愬姛", object.getString("itemClassName"));
+					}
+
+					log.info("浜у搧锛歿}涓嶅瓨鍦�", object.getString("itemNo"));
+					Product productNew = new Product();
+					productNew.setProductName(object.getString("note"));
+					productNew.setErpCode(object.getString("itemNo"));
+					productNew.setProductType(object.getString("grade"));
+					productNew.setUnitName(object.getString("unitName"));
+					productNew.setCompId(2089996921978040321L);
+					productNew.setParentId(productClass.getId());
+					TaxCode taxCode = taxCodeMapper.selectOne(Wrappers.<TaxCode>lambdaQuery().eq(TaxCode::getBm, object.getString("tfTaxClass")).last("limit 1"));
+					if (ObjUtil.isNotNull(taxCode)) {
+						productClass.setTaxClass(taxCode.getSphwjc());
+						productClass.setTaxRate(Double.valueOf(taxCode.getSl().replace("%", "")));
+					}
+					productMapper.insert(productNew);
+					log.info("浜у搧锛歿}鏂板鎴愬姛", object.getString("itemNo"));
+				}
+			}
+		}
+		if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjzt)) {
+			Product one = productMapper.selectOne(Wrappers.<Product>lambdaQuery()
+					.eq(Product::getErpCode, productCode)
+					.eq(Product::getCompId, smjzt)
+					.last("limit 1"));
+			if (ObjUtil.isNull(one)) {
+				JSONObject object = contractSubjectMatterService.syncProductBySMJ("tenant3", productCode);
+				if (ObjUtil.isNotNull(object)) {
+					Product productClass = productMapper.selectOne(Wrappers.<Product>lambdaQuery()
+							.eq(Product::getProductName, object.getString("itemClassName"))
+							.eq(Product::getCompId, "2089997578009128962")
+							.last("limit 1")
+					);
+					if (ObjUtil.isNull(productClass)) {
+						log.info("浜у搧鍒嗙被锛歿}涓嶅瓨鍦�", object.getString("itemClassName"));
+						productClass = new Product();
+						productClass.setProductName(object.getString("itemClassName"));
+						productClass.setErpCode(object.getString("itemClassName"));
+						productClass.setParentId(0L);
+						productClass.setCompId(2089997578009128962L);
+						TaxCode taxCode = taxCodeMapper.selectOne(Wrappers.<TaxCode>lambdaQuery().eq(TaxCode::getBm, object.getString("tfTaxClass")).last("limit 1"));
+						if (ObjUtil.isNotNull(taxCode)) {
+							productClass.setTaxClass(taxCode.getSphwjc());
+							productClass.setTaxRate(Double.valueOf(taxCode.getSl().replace("%", "")));
+						}
+						productMapper.insert(productClass);
+						log.info("浜у搧鍒嗙被锛歿}鏂板鎴愬姛", object.getString("itemClassName"));
+					}
+					log.info("浜у搧锛歿}涓嶅瓨鍦�", object.getString("itemNo"));
+					Product productNew = new Product();
+					productNew.setProductName(object.getString("note"));
+					productNew.setErpCode(object.getString("itemNo"));
+					productNew.setProductType(object.getString("grade"));
+					productNew.setUnitName(object.getString("unitName"));
+					productNew.setCompId(2089997578009128962L);
+					productNew.setParentId(productClass.getId());
+					TaxCode taxCode = taxCodeMapper.selectOne(Wrappers.<TaxCode>lambdaQuery().eq(TaxCode::getBm, object.getString("tfTaxClass")).last("limit 1"));
+					if (ObjUtil.isNotNull(taxCode)) {
+						productClass.setTaxClass(taxCode.getSphwjc());
+						productClass.setTaxRate(Double.valueOf(taxCode.getSl().replace("%", "")));
+					}
+					productMapper.insert(productNew);
+					log.info("浜у搧锛歿}鏂板鎴愬姛", object.getString("itemNo"));
+				}
+			}
+		}
 	}
 
 
@@ -3077,6 +3251,8 @@
 		contract.setReviewerNo(attDTO.getReviewerNo());
 		contract.setLinkPerson(attDTO.getLinkPerson());
 		contract.setLinkPhone(attDTO.getLinkPhone());
+		contract.setLastAttachmentName(attDTO.getLastAttachmentName());
+		contract.setLastAttachmentUrl(attDTO.getLastAttachmentUrl());
 		Long betweenDay = DateUtil.betweenDay(attDTO.getExpirationDate(),attDTO.getSignDate(),true);
 		contract.setDeliveryCycle(betweenDay.intValue());
 		baseMapper.updateById(contract);
@@ -3117,9 +3293,6 @@
 		log.info("鍚堝悓涓績鍚屾鍚堝悓鎺ュ彛鍥炲弬锛歿}", resp);
 		JSONObject respJson = JSONObject.parseObject(resp);
 		if (respJson.getString("code").equals("00")) {
-			contract.setLastAttachmentName(attDTO.getLastAttachmentName());
-			contract.setLastAttachmentUrl(attDTO.getLastAttachmentUrl());
-			baseMapper.updateById(contract);
 			return R.ok();
 		}
 		return R.failed("鍚堝悓涓績鏈�缁堢洊绔犵櫥璁癙DF涓婁紶澶辫触,鍘熷洜涓�:{}",respJson.getString("msg"));
@@ -3612,6 +3785,10 @@
 		if (CollUtil.isEmpty(addDTO.getContractSubjectMatter())) {
 			return R.failed("璇锋坊鍔犳爣鐨勭墿");
 		}
+		if (addDTO.getContractSubjectMatter().stream().anyMatch(contractSubjectMatterAddDTO -> StrUtil.isBlank(contractSubjectMatterAddDTO.getDataId())&&
+				StrUtil.isBlank(contractSubjectMatterAddDTO.getMaterialCode()))){
+			return R.failed("鏍囩殑鐗╃殑dataId鍜宮aterialCode涓嶈兘鍚屾椂涓虹┖");
+		}
 		if (CollUtil.isEmpty(addDTO.getContractPaymentSchedule())) {
 			return R.failed("璇锋坊鍔犱粯娆鹃樁娈垫垨浠樻闃舵缂哄皯");
 		}
@@ -3665,23 +3842,21 @@
 			addDTO.getContractSubjectMatter().stream().forEach(contractSubjectMatterAddDTO -> {
 				ContractSubjectMatter subjectMatter = BeanUtil.copyProperties(contractSubjectMatterAddDTO, ContractSubjectMatter.class);
 				subjectMatter.setContractId(contract.getId());
-				if (StrUtil.isNotBlank(subjectMatter.getMaterialCode())){
-					Product product = productMapper.selectOne(Wrappers.<Product>lambdaQuery().eq(Product::getErpCode,subjectMatter.getMaterialCode())
-							.last("limit 1"));
-					if (ObjUtil.isNotNull(product)){
-						subjectMatter.setMaterialInternalName(product.getId()+"");
-					}
-					if (ObjUtil.isNull(product)){
-						product = new Product();
-						product.setParentId(2101559148831944705L);
-						product.setProductName(subjectMatter.getMaterialInternalName());
-						product.setErpCode(subjectMatter.getMaterialCode());
-						product.setProductType(subjectMatter.getSpecification());
-						product.setTaxCode("1090117040000000000");
-						product.setTaxClass("娉�");
-						productMapper.insert(product);
-						subjectMatter.setMaterialInternalName(product.getId()+"");
-					}
+				Product product = productMapper.selectOne(Wrappers.<Product>lambdaQuery().eq(Product::getErpCode,subjectMatter.getMaterialCode())
+						.last("limit 1"));
+				if (ObjUtil.isNotNull(product)){
+					subjectMatter.setMaterialInternalName(product.getId()+"");
+				}
+				if (ObjUtil.isNull(product)){
+					product = new Product();
+					product.setParentId(2101559148831944705L);
+					product.setProductName(subjectMatter.getMaterialInternalName());
+					product.setErpCode(subjectMatter.getMaterialCode());
+					product.setProductType(subjectMatter.getSpecification());
+					product.setTaxCode("1090117040000000000");
+					product.setTaxClass("娉�");
+					productMapper.insert(product);
+					subjectMatter.setMaterialInternalName(product.getId()+"");
 				}
 				subjectMatter.setDeliveredQuantity(new BigDecimal("0"));
 				subjectMatter.setDeliveryStatus(0);
@@ -3749,4 +3924,79 @@
 		//鎺ㄩ�佸悎鍚屼腑蹇�
 		return R.ok(contract.getContractNo());
 	}
+
+	@Override
+	public R addContractOrder(ContractOrderAddDTO addDTO) {
+		Contract main = baseMapper.selectById(addDTO.getParentId());
+		Contract branch = BeanUtil.copyProperties(main,Contract.class,"id");
+		branch.setPartyAId(addDTO.getPartyAId());
+		branch.setPartyA(addDTO.getPartyA());
+		branch.setAttachmentUrl(addDTO.getAttachmentUrl());
+		branch.setAttachmentName(addDTO.getAttachmentName());
+		branch.setRemark(addDTO.getRemark());
+		branch.setParentId(addDTO.getParentId());
+		branch.setContractNo(generateBranchContractNo(main.getContractNo()));
+
+		baseMapper.insert(branch);
+
+		if (CollUtil.isNotEmpty(addDTO.getContractSubjectMatter())) {
+			addDTO.getContractSubjectMatter().stream().forEach(contractSubjectMatterAddDTO -> {
+				ContractSubjectMatter subjectMatter = BeanUtil.copyProperties(contractSubjectMatterAddDTO, ContractSubjectMatter.class);
+				subjectMatter.setContractId(branch.getId());
+				subjectMatter.setLineNo(ItemGeneratorUtil.nextId());
+				subjectMatter.setDeliveredQuantity(new BigDecimal("0"));
+				subjectMatter.setDeliveryStatus(0);
+				subjectMatter.setTotalAmount(contractSubjectMatterAddDTO.getQuantity().multiply(contractSubjectMatterAddDTO.getUnitPrice()));
+				contractSubjectMatterMapper.insert(subjectMatter);
+			});
+			branch.setAmount(addDTO.getContractSubjectMatter().stream().map(item -> item.getUnitPrice().multiply(item.getQuantity()))
+					// 绱姞鎵�鏈夐噾棰濓紝璁剧疆鍒濆鍊间负0
+					.reduce(BigDecimal.ZERO, BigDecimal::add));
+			baseMapper.updateById(branch);
+		}
+
+		if (CollUtil.isNotEmpty(addDTO.getContractPaymentSchedule())) {
+			AtomicInteger index = new AtomicInteger(1);
+			addDTO.getContractPaymentSchedule().stream().forEach(contractPaymentScheduleAddDTO -> {
+				int currentIndex = index.getAndIncrement();
+				ContractPaymentSchedule schedule = BeanUtil.copyProperties(contractPaymentScheduleAddDTO, ContractPaymentSchedule.class);
+				if (contractPaymentScheduleAddDTO.getStageName().equals("鍚堝悓绛捐")) {
+					schedule.setEffectiveEndDate(DateUtil.offsetDay(branch.getSignDate(), contractPaymentScheduleAddDTO.getAgreedDays()));
+				}
+				if (ObjUtil.isNotNull(schedule.getEffectiveDate())) {
+					if (schedule.getEffectiveDate().before(DateUtil.date())) {
+						schedule.setFulfillmentStatus(1);
+					} else {
+						schedule.setFulfillmentStatus(0);
+					}
+				}
+				if (contractPaymentScheduleAddDTO.getPaymentRatio().compareTo(new BigDecimal("0")) > 0) {
+					schedule.setPaymentStatus(0);
+				} else {
+					schedule.setPaymentStatus(3);
+				}
+				schedule.setContractId(branch.getId());
+				schedule.setContractName(branch.getContractName());
+				schedule.setPlannedAmount(branch.getAmount().multiply(schedule.getPaymentRatio().divide(new BigDecimal("100"))));
+				schedule.setStageOrder(currentIndex);
+				contractPaymentScheduleMapper.insert(schedule);
+				if (contractPaymentScheduleAddDTO.getStageName().equals("璐у埌绛炬敹")) {
+					branch.setArrivalScheduleId(schedule.getId());
+					baseMapper.updateById(branch);
+				}
+				if (contractPaymentScheduleAddDTO.getStageName().equals("璋冭瘯瀹屾垚鎴栭獙鏀�")) {
+					branch.setAcceptScheduleId(schedule.getId());
+					baseMapper.updateById(branch);
+				}
+				if (contractPaymentScheduleAddDTO.getStageName().equals("璐ㄤ繚閲�")) {
+					branch.setWarrantyScheduleId(schedule.getId());
+					baseMapper.updateById(branch);
+				}
+			});
+
+		}
+
+
+		return R.ok();
+	}
 }
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractSubjectMatterServiceImpl.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractSubjectMatterServiceImpl.java
index 36b40b0..022e1ae 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractSubjectMatterServiceImpl.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractSubjectMatterServiceImpl.java
@@ -1,6 +1,12 @@
 package com.by4cloud.platformx.business.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.http.HttpRequest;
+import cn.hutool.http.HttpResponse;
+import cn.hutool.http.HttpUtil;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -9,8 +15,10 @@
 import com.by4cloud.platformx.business.dto.ContractSubjectMatterAddDTO;
 import com.by4cloud.platformx.business.entity.ContractSubjectMatter;
 import com.by4cloud.platformx.business.entity.Product;
+import com.by4cloud.platformx.business.entity.TaxCode;
 import com.by4cloud.platformx.business.mapper.ContractSubjectMatterMapper;
 import com.by4cloud.platformx.business.mapper.ProductMapper;
+import com.by4cloud.platformx.business.mapper.TaxCodeMapper;
 import com.by4cloud.platformx.business.service.ContractSubjectMatterService;
 import com.by4cloud.platformx.business.vo.ContractSubjectMatterVo;
 import com.by4cloud.platformx.business.vo.SubjectMatterExcelVO;
@@ -21,6 +29,9 @@
 import com.by4cloud.platformx.common.security.util.SecurityUtils;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.BindingResult;
 
@@ -37,24 +48,57 @@
  */
 @Service
 @RequiredArgsConstructor
+@Slf4j
 public class ContractSubjectMatterServiceImpl extends ServiceImpl<ContractSubjectMatterMapper, ContractSubjectMatter> implements ContractSubjectMatterService {
 
 	private final ProductMapper productMapper;
+
+	private final TaxCodeMapper taxCodeMapper;
+
+	private final StringRedisTemplate redisTemplate;
+
+	@Value("${dept.smj}")
+	private String smj;
+
+	@Value("${dept.smjhw}")
+	private String smjhw;
+
+	@Value("${dept.smjsc}")
+	private String smjsc;
+
+	@Value("${dept.smjzt}")
+	private String smjzt;
+
+	@Value("${dept.sgb}")
+	private String sgb;
+
+	@Value("${dept.tfgs}")
+	private String tfgs;
+
+	@Value("${dept.jxc}")
+	private String jxc;
+
+	@Value("${dept.ymj}")
+	private String ymj;
+
+	@Value("${erp.smj}")
+	private String smjErp;
 
 	@Override
 	public R selectSubjectMatterProcess(Long id) {
 		MPJLambdaWrapper<ContractSubjectMatter> wrapper = new MPJLambdaWrapper<ContractSubjectMatter>()
 				.selectAll(ContractSubjectMatter.class)
-				.eq(ContractSubjectMatter::getContractId,id)
+				.eq(ContractSubjectMatter::getContractId, id)
 				.orderByAsc(ContractSubjectMatter::getCreateTime);
-		List<ContractSubjectMatterVo> matterVoList = baseMapper.selectJoinList(ContractSubjectMatterVo.class,wrapper);
+		List<ContractSubjectMatterVo> matterVoList = baseMapper.selectJoinList(ContractSubjectMatterVo.class, wrapper);
 		return R.ok(matterVoList);
 	}
 
 	@Override
 	public R selectSubjectMatter(Long contractId) {
-		return R.ok(baseMapper.selectListByScope(Wrappers.<ContractSubjectMatter>lambdaQuery().eq(ContractSubjectMatter::getContractId,contractId)
-				.orderByAsc(ContractSubjectMatter::getCreateTime), DataScope.of("comp_id")));
+		return R.ok(baseMapper.selectList(Wrappers.<ContractSubjectMatter>lambdaQuery()
+				.eq(ContractSubjectMatter::getContractId, contractId)
+				.orderByAsc(ContractSubjectMatter::getCreateTime)));
 	}
 
 	@Override
@@ -63,16 +107,87 @@
 		List<ContractSubjectMatterAddDTO> addDTOList = new ArrayList<>();
 		for (SubjectMatterExcelVO item : excelVOList) {
 			Set<String> errorMsg = new HashSet<>();
-
-			Product one = productMapper.selectOne(Wrappers.<Product>lambdaQuery()
-					.eq(Product::getErpCode, item.getMaterialCode())
-					.eq(Product::getCompId, SecurityUtils.getUser().getCompId())
-					.last("limit 1"));
-
-			if (one == null) {
-				errorMsg.add(item.getMaterialCode()+"erp缂栫爜涓嶅瓨鍦�");
+			if (StrUtil.isBlank(item.getMaterialCode())) {
+				errorMsg.add(item.getMaterialCode() + "erp缂栫爜涓嶈兘涓虹┖");
+				// 鏁版嵁涓嶅悎娉曟儏鍐�
+				errorMessageList.add(new ErrorMessage(item.getLineNum(), errorMsg));
+				continue;
 			}
-			if (CollUtil.isEmpty(errorMsg)) {
+			if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", sgb) || StrUtil.equals(SecurityUtils.getUser().getCompId() + "", tfgs) ||
+					StrUtil.equals(SecurityUtils.getUser().getCompId() + "", jxc) || StrUtil.equals(SecurityUtils.getUser().getCompId() + "", ymj)) {
+				Product one = productMapper.selectOne(Wrappers.<Product>lambdaQuery()
+						.eq(Product::getErpCode, item.getMaterialCode())
+						.eq(Product::getCompId, SecurityUtils.getUser().getCompId())
+						.last("limit 1"));
+				if (ObjUtil.isNull(one)) {
+					errorMsg.add(item.getMaterialCode() + "erp缂栫爜涓嶅瓨鍦�");
+					// 鏁版嵁涓嶅悎娉曟儏鍐�
+					errorMessageList.add(new ErrorMessage(item.getLineNum(), errorMsg));
+				} else {
+					ContractSubjectMatterAddDTO addDTO = new ContractSubjectMatterAddDTO();
+					addDTO.setMaterialCode(item.getMaterialCode());
+					addDTO.setMaterialInternalName(one.getProductName());
+					addDTO.setMaterialName(item.getMaterialName());
+					addDTO.setUnitPrice(item.getUnitPrice());
+					addDTO.setQuantity(item.getQuantity());
+					addDTO.setSpecification(one.getProductType());
+					addDTOList.add(addDTO);
+				}
+			}
+
+			if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smj) || StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjhw)) {
+				List<String> smjList = new ArrayList<>();
+				smjList.add(smj);
+				smjList.add(smjhw);
+				Product one = productMapper.selectOne(Wrappers.<Product>lambdaQuery()
+						.eq(Product::getErpCode, item.getMaterialCode())
+						.in(Product::getCompId, smjList)
+						.last("limit 1"));
+				if (ObjUtil.isNull(one)) {
+					JSONObject object = syncProductBySMJ("tenant1", item.getMaterialCode());
+					if (ObjUtil.isNotNull(object)) {
+						Product productClass = productMapper.selectOne(Wrappers.<Product>lambdaQuery()
+								.eq(Product::getProductName, object.getString("itemClassName"))
+								.eq(Product::getCompId, "2089995177814495234")
+								.last("limit 1")
+						);
+						if (ObjUtil.isNull(productClass)) {
+							log.info("浜у搧鍒嗙被锛歿}涓嶅瓨鍦�", object.getString("itemClassName"));
+							productClass = new Product();
+							productClass.setProductName(object.getString("itemClassName"));
+							productClass.setErpCode(object.getString("itemClassName"));
+							productClass.setParentId(0L);
+							productClass.setCompId(2089995177814495234L);
+							TaxCode taxCode = taxCodeMapper.selectOne(Wrappers.<TaxCode>lambdaQuery().eq(TaxCode::getBm, object.getString("tfTaxClass")).last("limit 1"));
+							if (ObjUtil.isNotNull(taxCode)) {
+								productClass.setTaxClass(taxCode.getSphwjc());
+								productClass.setTaxRate(Double.valueOf(taxCode.getSl().replace("%", "")));
+							}
+							productMapper.insert(productClass);
+							log.info("浜у搧鍒嗙被锛歿}鏂板鎴愬姛", object.getString("itemClassName"));
+						}
+
+						log.info("浜у搧锛歿}涓嶅瓨鍦�", object.getString("itemNo"));
+						Product productNew = new Product();
+						productNew.setProductName(object.getString("note"));
+						productNew.setErpCode(object.getString("itemNo"));
+						productNew.setProductType(object.getString("grade"));
+						productNew.setUnitName(object.getString("unitName"));
+						productNew.setCompId(2089995177814495234L);
+						productNew.setParentId(productClass.getId());
+						TaxCode taxCode = taxCodeMapper.selectOne(Wrappers.<TaxCode>lambdaQuery().eq(TaxCode::getBm, object.getString("tfTaxClass")).last("limit 1"));
+						if (ObjUtil.isNotNull(taxCode)) {
+							productClass.setTaxClass(taxCode.getSphwjc());
+							productClass.setTaxRate(Double.valueOf(taxCode.getSl().replace("%", "")));
+						}
+						productMapper.insert(productNew);
+						log.info("浜у搧锛歿}鏂板鎴愬姛", object.getString("itemNo"));
+					}
+					errorMsg.add(item.getMaterialCode() + "erp缂栫爜涓嶅瓨鍦�");
+					// 鏁版嵁涓嶅悎娉曟儏鍐�
+					errorMessageList.add(new ErrorMessage(item.getLineNum(), errorMsg));
+					continue;
+				}
 				ContractSubjectMatterAddDTO addDTO = new ContractSubjectMatterAddDTO();
 				addDTO.setMaterialCode(item.getMaterialCode());
 				addDTO.setMaterialInternalName(one.getProductName());
@@ -82,16 +197,183 @@
 				addDTO.setSpecification(one.getProductType());
 				addDTOList.add(addDTO);
 			}
-			else {
-				// 鏁版嵁涓嶅悎娉曟儏鍐�
-				errorMessageList.add(new ErrorMessage(item.getLineNum(), errorMsg));
+			if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjsc)) {
+				Product one = productMapper.selectOne(Wrappers.<Product>lambdaQuery()
+						.eq(Product::getErpCode, item.getMaterialCode())
+						.eq(Product::getCompId, smjsc)
+						.last("limit 1"));
+				if (ObjUtil.isNull(one)) {
+					JSONObject object = syncProductBySMJ("tenant2", item.getMaterialCode());
+					if (ObjUtil.isNotNull(object)) {
+						Product productClass = productMapper.selectOne(Wrappers.<Product>lambdaQuery()
+								.eq(Product::getProductName, object.getString("itemClassName"))
+								.eq(Product::getCompId, "2089996921978040321")
+								.last("limit 1")
+						);
+						if (ObjUtil.isNull(productClass)) {
+							log.info("浜у搧鍒嗙被锛歿}涓嶅瓨鍦�", object.getString("itemClassName"));
+							productClass = new Product();
+							productClass.setProductName(object.getString("itemClassName"));
+							productClass.setErpCode(object.getString("itemClassName"));
+							productClass.setParentId(0L);
+							productClass.setCompId(2089996921978040321L);
+							TaxCode taxCode = taxCodeMapper.selectOne(Wrappers.<TaxCode>lambdaQuery().eq(TaxCode::getBm, object.getString("tfTaxClass")).last("limit 1"));
+							if (ObjUtil.isNotNull(taxCode)) {
+								productClass.setTaxClass(taxCode.getSphwjc());
+								productClass.setTaxRate(Double.valueOf(taxCode.getSl().replace("%", "")));
+							}
+							productMapper.insert(productClass);
+							log.info("浜у搧鍒嗙被锛歿}鏂板鎴愬姛", object.getString("itemClassName"));
+						}
+
+						log.info("浜у搧锛歿}涓嶅瓨鍦�", object.getString("itemNo"));
+						Product productNew = new Product();
+						productNew.setProductName(object.getString("note"));
+						productNew.setErpCode(object.getString("itemNo"));
+						productNew.setProductType(object.getString("grade"));
+						productNew.setUnitName(object.getString("unitName"));
+						productNew.setCompId(2089996921978040321L);
+						productNew.setParentId(productClass.getId());
+						TaxCode taxCode = taxCodeMapper.selectOne(Wrappers.<TaxCode>lambdaQuery().eq(TaxCode::getBm, object.getString("tfTaxClass")).last("limit 1"));
+						if (ObjUtil.isNotNull(taxCode)) {
+							productClass.setTaxClass(taxCode.getSphwjc());
+							productClass.setTaxRate(Double.valueOf(taxCode.getSl().replace("%", "")));
+						}
+						productMapper.insert(productNew);
+						log.info("浜у搧锛歿}鏂板鎴愬姛", object.getString("itemNo"));
+					}
+					errorMsg.add(item.getMaterialCode() + "erp缂栫爜涓嶅瓨鍦�");
+					// 鏁版嵁涓嶅悎娉曟儏鍐�
+					errorMessageList.add(new ErrorMessage(item.getLineNum(), errorMsg));
+					continue;
+				}
+				ContractSubjectMatterAddDTO addDTO = new ContractSubjectMatterAddDTO();
+				addDTO.setMaterialCode(item.getMaterialCode());
+				addDTO.setMaterialInternalName(one.getProductName());
+				addDTO.setMaterialName(item.getMaterialName());
+				addDTO.setUnitPrice(item.getUnitPrice());
+				addDTO.setQuantity(item.getQuantity());
+				addDTO.setSpecification(one.getProductType());
+				addDTOList.add(addDTO);
+			}
+			if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjzt)) {
+				Product one = productMapper.selectOne(Wrappers.<Product>lambdaQuery()
+						.eq(Product::getErpCode, item.getMaterialCode())
+						.eq(Product::getCompId, smjzt)
+						.last("limit 1"));
+				if (ObjUtil.isNull(one)) {
+					JSONObject object = syncProductBySMJ("tenant3", item.getMaterialCode());
+					if (ObjUtil.isNotNull(object)) {
+						Product productClass = productMapper.selectOne(Wrappers.<Product>lambdaQuery()
+								.eq(Product::getProductName, object.getString("itemClassName"))
+								.eq(Product::getCompId, "2089997578009128962")
+								.last("limit 1")
+						);
+						if (ObjUtil.isNull(productClass)) {
+							log.info("浜у搧鍒嗙被锛歿}涓嶅瓨鍦�", object.getString("itemClassName"));
+							productClass = new Product();
+							productClass.setProductName(object.getString("itemClassName"));
+							productClass.setErpCode(object.getString("itemClassName"));
+							productClass.setParentId(0L);
+							productClass.setCompId(2089997578009128962L);
+							TaxCode taxCode = taxCodeMapper.selectOne(Wrappers.<TaxCode>lambdaQuery().eq(TaxCode::getBm, object.getString("tfTaxClass")).last("limit 1"));
+							if (ObjUtil.isNotNull(taxCode)) {
+								productClass.setTaxClass(taxCode.getSphwjc());
+								productClass.setTaxRate(Double.valueOf(taxCode.getSl().replace("%", "")));
+							}
+							productMapper.insert(productClass);
+							log.info("浜у搧鍒嗙被锛歿}鏂板鎴愬姛", object.getString("itemClassName"));
+						}
+
+						log.info("浜у搧锛歿}涓嶅瓨鍦�", object.getString("itemNo"));
+						Product productNew = new Product();
+						productNew.setProductName(object.getString("note"));
+						productNew.setErpCode(object.getString("itemNo"));
+						productNew.setProductType(object.getString("grade"));
+						productNew.setUnitName(object.getString("unitName"));
+						productNew.setCompId(2089997578009128962L);
+						productNew.setParentId(productClass.getId());
+						TaxCode taxCode = taxCodeMapper.selectOne(Wrappers.<TaxCode>lambdaQuery().eq(TaxCode::getBm, object.getString("tfTaxClass")).last("limit 1"));
+						if (ObjUtil.isNotNull(taxCode)) {
+							productClass.setTaxClass(taxCode.getSphwjc());
+							productClass.setTaxRate(Double.valueOf(taxCode.getSl().replace("%", "")));
+						}
+						productMapper.insert(productNew);
+						log.info("浜у搧锛歿}鏂板鎴愬姛", object.getString("itemNo"));
+					}
+					errorMsg.add(item.getMaterialCode() + "erp缂栫爜涓嶅瓨鍦�");
+					// 鏁版嵁涓嶅悎娉曟儏鍐�
+					errorMessageList.add(new ErrorMessage(item.getLineNum(), errorMsg));
+					continue;
+				}
+				ContractSubjectMatterAddDTO addDTO = new ContractSubjectMatterAddDTO();
+				addDTO.setMaterialCode(item.getMaterialCode());
+				addDTO.setMaterialInternalName(one.getProductName());
+				addDTO.setMaterialName(item.getMaterialName());
+				addDTO.setUnitPrice(item.getUnitPrice());
+				addDTO.setQuantity(item.getQuantity());
+				addDTO.setSpecification(one.getProductType());
+				addDTOList.add(addDTO);
 			}
 		}
 		if (CollUtil.isNotEmpty(errorMessageList)) {
-			return R.failed(errorMessageList,"閮ㄩ棬瀵煎叆澶辫触");
+			return R.failed(errorMessageList, "閮ㄩ棬瀵煎叆澶辫触");
 		}
 		return R.ok(addDTOList, "閮ㄩ棬瀵煎叆鎴愬姛");
 	}
+	@Override
+	public JSONObject syncProductBySMJ(String tenant1, String materialCode) {
+		String token = "";
+		if (redisTemplate.hasKey("SMJ_ERP_TOKEN")) {
+			token = (String) redisTemplate.opsForValue().get("SMJ_ERP_TOKEN");
+		} else {
+			token = getErpToken();
+		}
+		log.info("鐭崇叅鏈衡�斺��" + tenant1 + "鍚堝悓鏂板浜у搧瀵煎叆鏌ヨ鍏ュ弬锛歿}", materialCode);
+		HttpResponse response = HttpRequest.get(smjErp + "/api/item/v1/detail?itemNo=" + materialCode + "&tenantId=" + tenant1)
+				.header("token", token)       // 娣诲姞璁よ瘉澶�
+				.execute();                                         // 鎵ц璇锋眰.post(ymjErp,request.toJSONString());
+		log.info("鐭崇叅鏈衡�斺��" + tenant1 + "鍚堝悓鏂板浜у搧瀵煎叆鏌ヨ鍥炲弬锛歿}", response.body());
+		JSONObject resp = JSONObject.parseObject(response.body());
+		if (StrUtil.equals(resp.getString("code"), "0")) {
+			return resp.getJSONObject("data");
+		}
+		if (StrUtil.equals(resp.getString("code"), "401001")) {
+			getErpToken();
+		}
+		return null;
+	}
 
+	private String getErpToken() {
+		JSONObject loginJson = new JSONObject();
+		loginJson.put("username", "admin");
+		loginJson.put("password", "Zimafold@2026");
+		log.info("鐭崇叅鏈轰骇鍝佽幏鍙杢oken鍏ュ弬锛歿}", loginJson.toJSONString());
+		String loginResp = HttpUtil.post(smjErp + "/api/account/v1/login", loginJson.toJSONString());
+		log.info("鐭崇叅鏈轰骇鍝佽幏鍙杢oken鍥炲弬锛歿}", loginResp);
+		JSONObject respJson = JSONObject.parseObject(loginResp);
+		if (respJson.getInteger("code") == 0) {
+			JSONObject dataJson = JSONObject.parseObject(respJson.getString("data"));
+			redisTemplate.opsForValue().set("SMJ_ERP_TOEKN", dataJson.getString("token"));
+			log.info("鐭崇叅鏈篹rp token涓猴細{}", dataJson.getString("token"));
+			return dataJson.getString("token");
+		}
+		return "";
+	}
 
+	@Override
+	public R smjProduct(String erpCode) {
+		String token = "";
+		if (redisTemplate.hasKey("SMJ_ERP_TOKEN")) {
+			token = (String) redisTemplate.opsForValue().get("SMJ_ERP_TOKEN");
+		} else {
+			token = getErpToken();
+		}
+		log.info("鐭崇叅鏈衡�斺�攖enant1鍚堝悓鏂板浜у搧瀵煎叆鏌ヨ鍏ュ弬锛歿}", erpCode);
+		HttpResponse response = HttpRequest.get(smjErp + "/api/item/v1/detail?itemNo=" + erpCode + "&tenantId=tenant1")
+				.header("token", token)       // 娣诲姞璁よ瘉澶�
+				.execute();                                         // 鎵ц璇锋眰.post(ymjErp,request.toJSONString());
+		log.info("鐭崇叅鏈衡�斺�攖enant1鍚堝悓鏂板浜у搧瀵煎叆鏌ヨ鍥炲弬锛歿}", response.body());
+		return R.ok(response.body());
+	}
 }
\ No newline at end of file
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/OutBoundServiceImpl.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/OutBoundServiceImpl.java
index 7579123..29eaa91 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/OutBoundServiceImpl.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/OutBoundServiceImpl.java
@@ -510,7 +510,8 @@
 		for (OutSubjectMatterAddDTO outSubjectMatterAddDTO : addDTO.getSubjectMatterList()) {
 			ContractSubjectMatter subjectMatter = contractSubjectMatterMapper.selectOne(Wrappers.<ContractSubjectMatter>lambdaQuery()
 					.eq(ContractSubjectMatter::getContractId, contract.getId())
-					.eq(ContractSubjectMatter::getMaterialCode, outSubjectMatterAddDTO.getSubjectMatterCode())
+					.eq(StrUtil.isNotBlank(outSubjectMatterAddDTO.getDataId()),ContractSubjectMatter::getDataId, outSubjectMatterAddDTO.getDataId())
+					.eq(StrUtil.isNotBlank(outSubjectMatterAddDTO.getSubjectMatterCode()),ContractSubjectMatter::getMaterialCode, outSubjectMatterAddDTO.getSubjectMatterCode())
 					.eq(StrUtil.isNotBlank(outSubjectMatterAddDTO.getLineNo()), ContractSubjectMatter::getLineNo, outSubjectMatterAddDTO.getLineNo())
 					.last("limit 1"));
 			outAmount = outAmount.add(outSubjectMatterAddDTO.getOutBoundNum().multiply(subjectMatter.getUnitPrice()));
@@ -552,7 +553,8 @@
 		addDTO.getSubjectMatterList().stream().forEach(outSubjectMatterAddDTO -> {
 			ContractSubjectMatter subjectMatter = contractSubjectMatterMapper.selectOne(Wrappers.<ContractSubjectMatter>lambdaQuery()
 					.eq(ContractSubjectMatter::getContractId, contract.getId())
-					.eq(ContractSubjectMatter::getMaterialCode, outSubjectMatterAddDTO.getSubjectMatterCode())
+					.eq(StrUtil.isNotBlank(outSubjectMatterAddDTO.getDataId()),ContractSubjectMatter::getDataId, outSubjectMatterAddDTO.getDataId())
+					.eq(StrUtil.isNotBlank(outSubjectMatterAddDTO.getSubjectMatterCode()),ContractSubjectMatter::getMaterialCode, outSubjectMatterAddDTO.getSubjectMatterCode())
 					.ne(ContractSubjectMatter::getDeliveryStatus, 2)
 					.eq(StrUtil.isNotEmpty(outSubjectMatterAddDTO.getLineNo()), ContractSubjectMatter::getLineNo, outSubjectMatterAddDTO.getLineNo())
 					.last("limit 1"));
@@ -626,6 +628,10 @@
 		if (CollUtil.isEmpty(addDTO.getSubjectMatterList())) {
 			return R.failed("鍑哄簱鏍囩殑鐗╀笉鑳戒负绌�");
 		}
+		if (addDTO.getSubjectMatterList().stream().anyMatch(contractSubjectMatterAddDTO -> StrUtil.isBlank(contractSubjectMatterAddDTO.getDataId())&&
+				StrUtil.isBlank(contractSubjectMatterAddDTO.getSubjectMatterCode()))){
+			return R.failed("鏍囩殑鐗╃殑dataId鍜宮aterialCode涓嶈兘鍚屾椂涓虹┖");
+		}
 		// 1. 纭畾鏌ヨ鐢ㄧ殑鍚堝悓缂栧彿瀛楁鍊�
 		String targetContractNo = addDTO.getContractNo();
 		boolean isSgbAndEmptyOutbound = StrUtil.isEmpty(addDTO.getOutBoundType())
@@ -657,7 +663,8 @@
 		for (OutSubjectMatterAddDTO outSubjectMatterAddDTO : addDTO.getSubjectMatterList()) {
 			ContractSubjectMatter subjectMatter = contractSubjectMatterMapper.selectOne(Wrappers.<ContractSubjectMatter>lambdaQuery()
 					.eq(ContractSubjectMatter::getContractId, contract.getId())
-					.eq(ContractSubjectMatter::getMaterialCode, outSubjectMatterAddDTO.getSubjectMatterCode())
+					.eq(StrUtil.isNotBlank(outSubjectMatterAddDTO.getDataId()),ContractSubjectMatter::getDataId, outSubjectMatterAddDTO.getDataId())
+					.eq(StrUtil.isNotBlank(outSubjectMatterAddDTO.getSubjectMatterCode()),ContractSubjectMatter::getMaterialCode, outSubjectMatterAddDTO.getSubjectMatterCode())
 					.eq(StrUtil.isNotEmpty(outSubjectMatterAddDTO.getLineNo()), ContractSubjectMatter::getLineNo, outSubjectMatterAddDTO.getLineNo())
 					.last("limit 1"));
 			if (ObjUtil.isNull(subjectMatter)) {
@@ -833,4 +840,25 @@
 		baseMapper.delete(Wrappers.<OutBound>lambdaQuery().eq(OutBound::getBatchNumber, batchNumber));
 		return R.ok();
 	}
+
+	@Override
+	public R addContractOutSgb(OutBoundAddDTO addDTO) {
+		//鏍¢獙鍙傛暟
+		R<Contract> r = vailParam(addDTO);
+		if (!r.isOk()) {
+			return r;
+		}
+		Contract contract = r.getData();
+		String batchNumber = genBatchNumber();
+		//鍑哄簱
+		handleOutBound(batchNumber,contract, addDTO);
+
+		//淇濆瓨璧勯噾鏄庣粏
+		BigDecimal outBoundAmount = savePaymentConfirm(contract, addDTO);
+		//鏇存柊鍚堝悓鐘舵�佸強闃舵
+		contract.setOutBoundAmout(outBoundAmount);
+		updateContractSchedule(contract);
+
+		return R.ok(batchNumber);
+	}
 }
\ No newline at end of file
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ProductServiceImpl.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ProductServiceImpl.java
index 5aa80d5..94bc184 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ProductServiceImpl.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ProductServiceImpl.java
@@ -383,6 +383,7 @@
 						productNew.setProductName(product.getString("note"));
 						productNew.setErpCode(product.getString("itemNo"));
 						productNew.setProductType(product.getString("grade"));
+						productNew.setUnitName(product.getString("unitName"));
 						if(StrUtil.equals(tan,"tenant1")){
 							productNew.setCompId(2089995177814495234L);
 						}
@@ -395,8 +396,8 @@
 						productNew.setParentId(productClass.getId());
 						TaxCode taxCode = taxCodeMapper.selectOne(Wrappers.<TaxCode>lambdaQuery().eq(TaxCode::getBm,product.getString("tfTaxClass")).last("limit 1"));
 						if (ObjUtil.isNotNull(taxCode)){
-							productClass.setTaxClass(taxCode.getSphwjc());
-							productClass.setTaxRate(Double.valueOf(taxCode.getSl().replace("%","")));
+							productNew.setTaxClass(taxCode.getSphwjc());
+							productNew.setTaxRate(Double.valueOf(taxCode.getSl().replace("%","")));
 						}
 						baseMapper.insert(productNew);
 						log.info("浜у搧锛歿}鏂板鎴愬姛",product.getString("itemNo"));
@@ -426,4 +427,266 @@
 		}
 		return "";
 	}
+
+
+	@Override
+	public R pullProductData() {
+		String startDate = DateUtil.formatDate(DateUtil.offsetDay(new Date(), -1));
+
+		String token = "";
+		if (redisTemplate.hasKey("SMJ_ERP_TOKEN")) {
+			token = (String) redisTemplate.opsForValue().get("SMJ_ERP_TOKEN");
+		} else {
+			token = getErpToken();
+		}
+		if (StrUtil.isEmpty(token)){
+			return R.failed("鐭崇叅鏈虹櫥褰曡幏鍙杢oken澶辫触");
+		}
+		List<String> list = Arrays.asList("tenant1","tenant2","tenant3");
+		String tan = "";
+		if (StrUtil.equals(smj,SecurityUtils.getUser().getCompId()+"")||StrUtil.equals(smjhw,SecurityUtils.getUser().getCompId()+"")){
+			tan = "tenant1";
+		}
+		if (StrUtil.equals(smjsc,SecurityUtils.getUser().getCompId()+"")){
+			tan = "tenant2";
+		}
+		if (StrUtil.equals(smjzt,SecurityUtils.getUser().getCompId()+"")){
+			tan = "tenant3";
+		}
+		if (StrUtil.isBlank(tan)){
+			return R.failed("甯愬彿淇℃伅寮傚父璇疯仈绯绘妧鏈汉鍛�");
+		}
+		HttpResponse response = HttpRequest.get(smjErp + "/api/item/v1/byDateCre?startDate=" + startDate+"&tenantId="+tan)
+				.header("token", token)       // 娣诲姞璁よ瘉澶�
+				.execute();                                         // 鎵ц璇锋眰.post(ymjErp,request.toJSONString());
+		log.info("鐭崇叅鏈衡�斺��"+tan+"浜у搧鑾峰彇鍥炲弬锛歿}", response.body());
+		JSONObject proResult = JSONObject.parseObject(response.body());
+		JSONArray items = proResult.getJSONArray("data");
+		if (CollUtil.isNotEmpty(items)){
+			log.info("鐭崇叅鏈轰骇鍝佽幏鍙栨暟閲忥細{}", items.size());
+			String finalTan = tan;
+			items.stream().forEach(item->{
+				JSONObject product = (JSONObject) item;
+				Product productClass = baseMapper.selectOne(Wrappers.<Product>lambdaQuery()
+								.eq(Product::getProductName,product.getString("itemClassName"))
+//							.and(wrapper -> wrapper.eq(Product::getCompId,"2089995177814495234")
+//									.or().eq(Product::getCompId,"2089996921978040321")
+//									.or().eq(Product::getCompId,"2089997578009128962")
+//							)
+								.eq(StrUtil.equals(finalTan,"tenant1"),Product::getCompId,"2089995177814495234")
+								.eq(StrUtil.equals(finalTan,"tenant2"),Product::getCompId,"2089996921978040321")
+								.eq(StrUtil.equals(finalTan,"tenant3"),Product::getCompId,"2089997578009128962")
+								.last("limit 1")
+				);
+				if(ObjUtil.isNull(productClass)){
+					log.info("浜у搧鍒嗙被锛歿}涓嶅瓨鍦�",product.getString("itemClassName"));
+					productClass = new Product();
+					productClass.setProductName(product.getString("itemClassName"));
+					productClass.setErpCode(product.getString("itemClassName"));
+					productClass.setParentId(0L);
+					if(StrUtil.equals(finalTan,"tenant1")){
+						productClass.setCompId(2089995177814495234L);
+					}
+					if(StrUtil.equals(finalTan,"tenant2")){
+						productClass.setCompId(2089996921978040321L);
+					}
+					if(StrUtil.equals(finalTan,"tenant3")){
+						productClass.setCompId(2089997578009128962L);
+					}
+					TaxCode taxCode = taxCodeMapper.selectOne(Wrappers.<TaxCode>lambdaQuery().eq(TaxCode::getBm,product.getString("tfTaxClass")).last("limit 1"));
+					if (ObjUtil.isNotNull(taxCode)){
+						productClass.setTaxClass(taxCode.getSphwjc());
+						productClass.setTaxRate(Double.valueOf(taxCode.getSl().replace("%","")));
+					}
+					baseMapper.insert(productClass);
+					log.info("浜у搧鍒嗙被锛歿}鏂板鎴愬姛",product.getString("itemClassName"));
+				}
+				Product productNew = baseMapper.selectOne(Wrappers.<Product>lambdaQuery()
+								.eq(Product::getErpCode,product.getString("itemNo"))
+//							.and(wrapper -> wrapper.eq(Product::getCompId,"2089995177814495234")
+//									.or().eq(Product::getCompId,"2089996921978040321")
+//									.or().eq(Product::getCompId,"2089997578009128962")
+//							)
+								.eq(StrUtil.equals(finalTan,"tenant1"),Product::getCompId,"2089995177814495234")
+								.eq(StrUtil.equals(finalTan,"tenant2"),Product::getCompId,"2089996921978040321")
+								.eq(StrUtil.equals(finalTan,"tenant3"),Product::getCompId,"2089997578009128962")
+								.last("limit 1")
+				);
+				if(ObjUtil.isNull(productNew)){
+					log.info("浜у搧锛歿}涓嶅瓨鍦�",product.getString("itemNo"));
+					productNew = new Product();
+					productNew.setProductName(product.getString("note"));
+					productNew.setErpCode(product.getString("itemNo"));
+					productNew.setProductType(product.getString("grade"));
+					productNew.setUnitName(product.getString("unitName"));
+					if(StrUtil.equals(finalTan,"tenant1")){
+						productNew.setCompId(2089995177814495234L);
+					}
+					if(StrUtil.equals(finalTan,"tenant2")){
+						productNew.setCompId(2089996921978040321L);
+					}
+					if(StrUtil.equals(finalTan,"tenant3")){
+						productNew.setCompId(2089997578009128962L);
+					}
+					productNew.setParentId(productClass.getId());
+					TaxCode taxCode = taxCodeMapper.selectOne(Wrappers.<TaxCode>lambdaQuery().eq(TaxCode::getBm,product.getString("tfTaxClass")).last("limit 1"));
+					if (ObjUtil.isNotNull(taxCode)){
+						productNew.setTaxClass(taxCode.getSphwjc());
+						productNew.setTaxRate(Double.valueOf(taxCode.getSl().replace("%","")));
+					}
+					baseMapper.insert(productNew);
+					log.info("浜у搧锛歿}鏂板鎴愬姛",product.getString("itemNo"));
+					return;
+				}
+				log.info("浜у搧锛歿}瀛樺湪",product.getString("itemNo"));
+			});
+		}
+
+
+		return R.ok();
+	}
+
+	@Override
+	public R pullProductPage() {
+		String token = "";
+		if (redisTemplate.hasKey("SMJ_ERP_TOKEN")) {
+			token = (String) redisTemplate.opsForValue().get("SMJ_ERP_TOKEN");
+		} else {
+			token = getErpToken();
+		}
+		if (StrUtil.isEmpty(token)){
+			return R.failed("鐭崇叅鏈虹櫥褰曡幏鍙杢oken澶辫触");
+		}
+		List<String> list = Arrays.asList("tenant1","tenant2","tenant3");
+		String tan = "";
+		if (StrUtil.equals(smj,SecurityUtils.getUser().getCompId()+"")||StrUtil.equals(smjhw,SecurityUtils.getUser().getCompId()+"")){
+			tan = "tenant1";
+		}
+		if (StrUtil.equals(smjsc,SecurityUtils.getUser().getCompId()+"")){
+			tan = "tenant2";
+		}
+		if (StrUtil.equals(smjzt,SecurityUtils.getUser().getCompId()+"")){
+			tan = "tenant3";
+		}
+		if (StrUtil.isBlank(tan)){
+			return R.failed("甯愬彿淇℃伅寮傚父璇疯仈绯绘妧鏈汉鍛�");
+		}
+		JSONObject req = new JSONObject();
+		req.put("page","1");
+		req.put("size","100");
+		HttpResponse response = HttpRequest.post(smjErp + "/api/item/v1/queryPage?tenantId="+tan)
+				.header("token", token)   // 娣诲姞璁よ瘉澶�
+				.body(req.toJSONString())
+				.execute();                                         // 鎵ц璇锋眰.post(ymjErp,request.toJSONString());
+		log.info("鐭崇叅鏈衡�斺��"+tan+"浜у搧鑾峰彇鍥炲弬锛歿}", response.body());
+		JSONObject proResult = JSONObject.parseObject(response.body());
+		JSONObject data = proResult.getJSONObject("data");
+		if (ObjUtil.isNotNull(data)&&data.containsKey("pages")){
+			Integer pages = data.getInteger("pages");
+			for (int i = 1; i < pages+1; i++) {
+				JSONObject reqPage = new JSONObject();
+				reqPage.put("page",i);
+				reqPage.put("size","100");
+				HttpResponse responsePage = HttpRequest.post(smjErp + "/api/item/v1/queryPage?tenantId="+tan)
+						.header("token", token)   // 娣诲姞璁よ瘉澶�
+						.body(req.toJSONString())
+						.execute();                                         // 鎵ц璇锋眰.post(ymjErp,request.toJSONString());
+				log.info("鐭崇叅鏈衡�斺��"+tan+"浜у搧鑾峰彇鍥炲弬锛歿}", responsePage.body());
+				JSONObject pageResult = JSONObject.parseObject(response.body());
+				JSONObject dataPage = pageResult.getJSONObject("data");
+				if (ObjUtil.isNotNull(data)&&dataPage.containsKey("records")&&CollUtil.isNotEmpty(dataPage.getJSONArray("records"))){
+					if (CollUtil.isNotEmpty(dataPage.getJSONArray("records"))){
+						log.info("鐭崇叅鏈轰骇鍝佽幏鍙栨暟閲忥細{}", dataPage.getJSONArray("records").size());
+						String finalTan = tan;
+						dataPage.getJSONArray("records").stream().forEach(item->{
+							JSONObject product = (JSONObject) item;
+							Product productClass = baseMapper.selectOne(Wrappers.<Product>lambdaQuery()
+											.eq(Product::getProductName,product.getString("itemClassName"))
+//							.and(wrapper -> wrapper.eq(Product::getCompId,"2089995177814495234")
+//									.or().eq(Product::getCompId,"2089996921978040321")
+//									.or().eq(Product::getCompId,"2089997578009128962")
+//							)
+											.eq(StrUtil.equals(finalTan,"tenant1"),Product::getCompId,"2089995177814495234")
+											.eq(StrUtil.equals(finalTan,"tenant2"),Product::getCompId,"2089996921978040321")
+											.eq(StrUtil.equals(finalTan,"tenant3"),Product::getCompId,"2089997578009128962")
+											.last("limit 1")
+							);
+							if(ObjUtil.isNull(productClass)){
+								log.info("浜у搧鍒嗙被锛歿}涓嶅瓨鍦�",product.getString("itemClassName"));
+								productClass = new Product();
+								productClass.setProductName(product.getString("itemClassName"));
+								productClass.setErpCode(product.getString("itemClassName"));
+								productClass.setParentId(0L);
+								if(StrUtil.equals(finalTan,"tenant1")){
+									productClass.setCompId(2089995177814495234L);
+								}
+								if(StrUtil.equals(finalTan,"tenant2")){
+									productClass.setCompId(2089996921978040321L);
+								}
+								if(StrUtil.equals(finalTan,"tenant3")){
+									productClass.setCompId(2089997578009128962L);
+								}
+								TaxCode taxCode = taxCodeMapper.selectOne(Wrappers.<TaxCode>lambdaQuery().eq(TaxCode::getBm,product.getString("tfTaxClass")).last("limit 1"));
+								if (ObjUtil.isNotNull(taxCode)){
+									productClass.setTaxClass(taxCode.getSphwjc());
+									productClass.setTaxRate(Double.valueOf(taxCode.getSl().replace("%","")));
+								}
+								baseMapper.insert(productClass);
+								log.info("浜у搧鍒嗙被锛歿}鏂板鎴愬姛",product.getString("itemClassName"));
+							}
+							Product productNew = baseMapper.selectOne(Wrappers.<Product>lambdaQuery()
+											.eq(Product::getErpCode,product.getString("itemNo"))
+//							.and(wrapper -> wrapper.eq(Product::getCompId,"2089995177814495234")
+//									.or().eq(Product::getCompId,"2089996921978040321")
+//									.or().eq(Product::getCompId,"2089997578009128962")
+//							)
+											.eq(StrUtil.equals(finalTan,"tenant1"),Product::getCompId,"2089995177814495234")
+											.eq(StrUtil.equals(finalTan,"tenant2"),Product::getCompId,"2089996921978040321")
+											.eq(StrUtil.equals(finalTan,"tenant3"),Product::getCompId,"2089997578009128962")
+											.last("limit 1")
+							);
+							if(ObjUtil.isNull(productNew)){
+								log.info("浜у搧锛歿}涓嶅瓨鍦�",product.getString("itemNo"));
+								productNew = new Product();
+								productNew.setProductName(product.getString("note"));
+								productNew.setErpCode(product.getString("itemNo"));
+								productNew.setProductType(product.getString("grade"));
+								productNew.setUnitName(product.getString("unitName"));
+								if(StrUtil.equals(finalTan,"tenant1")){
+									productNew.setCompId(2089995177814495234L);
+								}
+								if(StrUtil.equals(finalTan,"tenant2")){
+									productNew.setCompId(2089996921978040321L);
+								}
+								if(StrUtil.equals(finalTan,"tenant3")){
+									productNew.setCompId(2089997578009128962L);
+								}
+								productNew.setParentId(productClass.getId());
+								TaxCode taxCode = taxCodeMapper.selectOne(Wrappers.<TaxCode>lambdaQuery().eq(TaxCode::getBm,product.getString("tfTaxClass")).last("limit 1"));
+								if (ObjUtil.isNotNull(taxCode)){
+									productNew.setTaxClass(taxCode.getSphwjc());
+									productNew.setTaxRate(Double.valueOf(taxCode.getSl().replace("%","")));
+								}
+								baseMapper.insert(productNew);
+								log.info("浜у搧锛歿}鏂板鎴愬姛",product.getString("itemNo"));
+								return;
+							}
+							if(ObjUtil.isNotNull(productNew)) {
+								log.info("浜у搧锛歿}瀛樺湪", product.getString("itemNo"));
+								productNew.setProductType(product.getString("grade"));
+								productNew.setUnitName(product.getString("unitName"));
+								TaxCode taxCode = taxCodeMapper.selectOne(Wrappers.<TaxCode>lambdaQuery().eq(TaxCode::getBm,product.getString("tfTaxClass")).last("limit 1"));
+								if (ObjUtil.isNotNull(taxCode)){
+									productNew.setTaxClass(taxCode.getSphwjc());
+									productNew.setTaxRate(Double.valueOf(taxCode.getSl().replace("%","")));
+								}
+								baseMapper.updateById(productNew);
+							}
+						});
+					}
+				}
+			}
+		}
+		return R.ok();
+	}
 }
\ No newline at end of file
diff --git a/platformx-business-finance-biz/src/main/resources/mapper/ProductMapper.xml b/platformx-business-finance-biz/src/main/resources/mapper/ProductMapper.xml
index 9fb1c65..c9ada1d 100644
--- a/platformx-business-finance-biz/src/main/resources/mapper/ProductMapper.xml
+++ b/platformx-business-finance-biz/src/main/resources/mapper/ProductMapper.xml
@@ -20,7 +20,7 @@
 		SELECT
 			t.id,
 			t.product_name,
-			t.main_code,
+			t.unit_name,
 			t.erp_code,
 			t.product_type,
 			t.tax_rate,
@@ -47,7 +47,7 @@
 		SELECT
 			t.id,
 			CONCAT(t.product_name,IFNULL(t.product_type,'')) product_name,
-			t.main_code,
+			t.unit_name,
 			t.erp_code,
 			t.product_type,
 			t.tax_rate,
@@ -108,7 +108,7 @@
 		SELECT
 		t.id,
 		CONCAT(t.product_name,IFNULL(t.product_type,'')) product_name,
-		t.main_code,
+		t.unit_name,
 		t.erp_code,
 		t.product_type,
 		t.tax_rate,
@@ -169,7 +169,7 @@
 		SELECT
 			t.id,
 			t.product_name,
-			t.main_code,
+			t.unit_name,
 			t.erp_code,
 			t.product_type,
 			t.tax_rate,
@@ -202,7 +202,7 @@
 		SELECT
 		t.id,
 		t.product_name,
-		t.main_code,
+		t.unit_name,
 		t.erp_code,
 		t.product_type,
 		t.tax_rate,

--
Gitblit v1.9.1