diff --git a/zt-module-base/zt-module-base-server/src/main/resources/mapper/base/CompanyRelativityMapper.xml b/zt-module-base/zt-module-base-server/src/main/resources/mapper/base/CompanyRelativityMapper.xml
index 86abdfb..692a32b 100644
--- a/zt-module-base/zt-module-base-server/src/main/resources/mapper/base/CompanyRelativityMapper.xml
+++ b/zt-module-base/zt-module-base-server/src/main/resources/mapper/base/CompanyRelativityMapper.xml
@@ -31,10 +31,10 @@
where d.DELETED = 0
and d.IS_COMPANY = 1
- and c.NUM = #{erpNumber}
+ and c.NUM like concat('%', #{erpNumber}, '%')
- and d.CODE = #{number}
+ and d.CODE like concat('%', #{number}, '%')
and d.NAME like concat('%', #{name}, '%')
diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/ErpCustomerPageReqVO.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/ErpCustomerPageReqVO.java
index a8ab791..ff26ba3 100644
--- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/ErpCustomerPageReqVO.java
+++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/ErpCustomerPageReqVO.java
@@ -1,5 +1,6 @@
package com.zt.plat.module.erp.controller.admin.erp.vo;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.zt.plat.framework.common.pojo.PageParam;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@@ -42,4 +43,7 @@ public class ErpCustomerPageReqVO extends PageParam {
@Schema(description = "冻结标识")
private String isProvisional;
+ @Schema(description = "税号/社会信用代码")
+ private String taxNumber;
+
}
\ No newline at end of file
diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/ErpCustomerRespVO.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/ErpCustomerRespVO.java
index 6fa7d0e..66131d6 100644
--- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/ErpCustomerRespVO.java
+++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/ErpCustomerRespVO.java
@@ -52,4 +52,8 @@ public class ErpCustomerRespVO {
@ExcelProperty("冻结标识")
private String isProvisional;
+ @Schema(description = "税号/社会信用代码")
+ @ExcelProperty("税号")
+ private String taxNumber;
+
}
\ No newline at end of file
diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/ErpCustomerSaveReqVO.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/ErpCustomerSaveReqVO.java
index 79b792f..fa1f1d1 100644
--- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/ErpCustomerSaveReqVO.java
+++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/ErpCustomerSaveReqVO.java
@@ -46,4 +46,6 @@ public class ErpCustomerSaveReqVO {
@Schema(description = "冻结标识")
private String isProvisional;
+ @Schema(description = "税号/社会信用代码")
+ private String taxNumber;
}
\ No newline at end of file
diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/dataobject/erp/ErpCustomerDO.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/dataobject/erp/ErpCustomerDO.java
index cb4037d..b758d60 100644
--- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/dataobject/erp/ErpCustomerDO.java
+++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/dataobject/erp/ErpCustomerDO.java
@@ -77,7 +77,12 @@ public class ErpCustomerDO{
@TableField("IS_PRVS")
private String isProvisional;
- @TableField(exist = false)
- private Integer TENANT_ID;
+ @TableField("IS_ENB")
+ private String isEnable;
+ /**
+ * 税号/社会信用代码
+ */
+ @TableField("TAX_NUM")
+ private String taxNumber;
}
\ No newline at end of file
diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpCustomerServiceImpl.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpCustomerServiceImpl.java
index 7576678..5b843a3 100644
--- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpCustomerServiceImpl.java
+++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpCustomerServiceImpl.java
@@ -183,7 +183,7 @@ public class ErpCustomerServiceImpl implements ErpCustomerService {
}
DO.setIsGiveback(dataJson.getString("XDELE"));
DO.setIsProvisional(dataJson.getString("XBLCK"));
-// DO.setType(type.modetype);
+ DO.setTaxNumber(dataJson.getString("TAXNO"));
// 使用 Map 优化查找效率,避免每次遍历 comnumbers 列表
if (number != null && numbers.get(number) != null) {
diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpMaterialServiceImpl.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpMaterialServiceImpl.java
index 94d9c20..1eb0a79 100644
--- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpMaterialServiceImpl.java
+++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpMaterialServiceImpl.java
@@ -83,6 +83,7 @@ public class ErpMaterialServiceImpl implements ErpMaterialService {
public void updateErpMaterial(ErpMaterialSaveReqVO updateReqVO) {
// 校验存在
validateErpMaterialExists(updateReqVO.getId());
+ validateErpFactoryExistsNumber(updateReqVO.getDownCenterNumber());
// 更新
ErpMaterialDO updateObj = BeanUtils.toBean(updateReqVO, ErpMaterialDO.class);
if (updateObj.getType().equals("SPLY")) {