Merge branch 'refs/heads/dev' into test

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/AccountMapper.java

@@ -28,8 +28,8 @@ public interface AccountMapper extends BaseMapperX<AccountDO> {
                 .likeIfPresent(AccountDO::getCustomerName, reqVO.getCustomerName())
                 .likeIfPresent(AccountDO::getCustomerNumber, reqVO.getCustomerNumber())
                 .eqIfPresent(AccountDO::getIsEnable, reqVO.getIsEnable())
-                .eqIfPresent(AccountDO::getAccountNumber, reqVO.getAccountNumber())
+                .likeIfPresent(AccountDO::getAccountNumber, reqVO.getAccountNumber())
-                .eqIfPresent(AccountDO::getTaxNumber, reqVO.getTaxNumber())
+                .likeIfPresent(AccountDO::getTaxNumber, reqVO.getTaxNumber())
                 .betweenIfPresent(AccountDO::getCreateTime, reqVO.getCreateTime())
                 .orderByDesc(AccountDO::getId));
     }
@@ -41,11 +41,11 @@ public interface AccountMapper extends BaseMapperX<AccountDO> {
                 .likeIfPresent(AccountDO::getAddress, dto.getAddress())
                 .likeIfPresent(AccountDO::getPhone, dto.getPhone())
                 .eqIfPresent(AccountDO::getBankAccount, dto.getBankAccount())
-                .eqIfPresent(AccountDO::getCustomerName, dto.getCustomerName())
+                .likeIfPresent(AccountDO::getCustomerName, dto.getCustomerName())
-                .eqIfPresent(AccountDO::getCustomerNumber, dto.getCustomerNumber())
+                .likeIfPresent(AccountDO::getCustomerNumber, dto.getCustomerNumber())
                 .eqIfPresent(AccountDO::getIsEnable, dto.getIsEnable())
-                .eqIfPresent(AccountDO::getAccountNumber, dto.getAccountNumber())
+                .likeIfPresent(AccountDO::getAccountNumber, dto.getAccountNumber())
-                .eqIfPresent(AccountDO::getTaxNumber, dto.getTaxNumber())
+                .likeIfPresent(AccountDO::getTaxNumber, dto.getTaxNumber())
                 .orderByDesc(AccountDO::getId));
     }
 }

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/CompanyRelativityMapper.java

@@ -21,8 +21,8 @@ public interface CompanyRelativityMapper extends BaseMapperX<CompanyRelativityDO
 
     default PageResult<CompanyRelativityDO> selectPage(CompanyRelativityPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<CompanyRelativityDO>()
-                .eqIfPresent(CompanyRelativityDO::getErpNumber, reqVO.getErpNumber())
+                .likeIfPresent(CompanyRelativityDO::getErpNumber, reqVO.getErpNumber())
-                .eqIfPresent(CompanyRelativityDO::getNumber, reqVO.getNumber())
+                .likeIfPresent(CompanyRelativityDO::getNumber, reqVO.getNumber())
                 .betweenIfPresent(CompanyRelativityDO::getCreateTime, reqVO.getCreateTime())
                 .orderByDesc(CompanyRelativityDO::getId));
     }

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/ContactMapper.java

@@ -21,11 +21,11 @@ public interface ContactMapper extends BaseMapperX<ContactDO> {
                 .likeIfPresent(ContactDO::getContact, reqVO.getContact())
                 .likeIfPresent(ContactDO::getTel, reqVO.getTel())
                 .likeIfPresent(ContactDO::getCustomerName, reqVO.getCustomerName())
-                .eqIfPresent(ContactDO::getCustomerNumber, reqVO.getCustomerNumber())
+                .likeIfPresent(ContactDO::getCustomerNumber, reqVO.getCustomerNumber())
                 .eqIfPresent(ContactDO::getIsEnable, reqVO.getIsEnable())
-                .eqIfPresent(ContactDO::getEmail, reqVO.getEmail())
+                .likeIfPresent(ContactDO::getEmail, reqVO.getEmail())
-                .eqIfPresent(ContactDO::getFax, reqVO.getFax())
+                .likeIfPresent(ContactDO::getFax, reqVO.getFax())
-                .eqIfPresent(ContactDO::getAddress, reqVO.getAddress())
+                .likeIfPresent(ContactDO::getAddress, reqVO.getAddress())
                 .betweenIfPresent(ContactDO::getCreateTime, reqVO.getCreateTime())
                 .orderByDesc(ContactDO::getId));
     }

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/FactoryMapper.java

@@ -17,16 +17,16 @@ public interface FactoryMapper extends BaseMapperX<FactoryDO> {
 
     default PageResult<FactoryDO> selectPage(FactoryPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<FactoryDO>()
-                .eqIfPresent(FactoryDO::getCompanyNumber, reqVO.getCompanyNumber())
+                .likeIfPresent(FactoryDO::getCompanyNumber, reqVO.getCompanyNumber())
                 .likeIfPresent(FactoryDO::getCpnName, reqVO.getCpnName())
-                .eqIfPresent(FactoryDO::getErpCompanyNumber, reqVO.getErpCompanyNumber())
+                .likeIfPresent(FactoryDO::getErpCompanyNumber, reqVO.getErpCompanyNumber())
                 .likeIfPresent(FactoryDO::getErpCompanyName, reqVO.getErpCompanyName())
                 .likeIfPresent(FactoryDO::getName, reqVO.getName())
-                .eqIfPresent(FactoryDO::getNumber, reqVO.getNumber())
+                .likeIfPresent(FactoryDO::getNumber, reqVO.getNumber())
                 .betweenIfPresent(FactoryDO::getCreateTime, reqVO.getCreateTime())
                 .eqIfPresent(FactoryDO::getIsEnable, reqVO.getIsEnable())
                 .likeIfPresent(FactoryDO::getErpName, reqVO.getErpName())
-                .eqIfPresent(FactoryDO::getErpNumber, reqVO.getErpNumber())
+                .likeIfPresent(FactoryDO::getErpNumber, reqVO.getErpNumber())
                 .orderByDesc(FactoryDO::getId));
     }
 

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/MaterialInfomationMapper.java

@@ -23,9 +23,9 @@ public interface MaterialInfomationMapper extends BaseMapperX<MaterialInfomation
 
     default PageResult<MaterialInfomationDO> selectPage(MaterialInfomationPageReqVO reqVO, Collection<Long> infomationIds) {
         return BaseMapperX.super.selectPage(reqVO, new LambdaQueryWrapperX<MaterialInfomationDO>()
-                .eqIfPresent(MaterialInfomationDO::getCode, reqVO.getCode())
+                .likeIfPresent(MaterialInfomationDO::getCode, reqVO.getCode())
                 .likeIfPresent(MaterialInfomationDO::getName, reqVO.getName())
-                .eqIfPresent(MaterialInfomationDO::getRemark, reqVO.getRemark())
+                .likeIfPresent(MaterialInfomationDO::getRemark, reqVO.getRemark())
                 .betweenIfPresent(MaterialInfomationDO::getCreateTime, reqVO.getCreateTime())
                 .inIfPresent(MaterialInfomationDO::getId, infomationIds)
                 .orderByDesc(MaterialInfomationDO::getId));

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/MaterialOtherMapper.java

@@ -22,7 +22,7 @@ public interface MaterialOtherMapper extends BaseMapperX<MaterialOtherDO> {
         return selectPage(reqVO, new LambdaQueryWrapperX<MaterialOtherDO>()
                 .likeIfPresent(MaterialOtherDO::getMaterialNumber, reqVO.getMaterialNumber())
                 .likeIfPresent(MaterialOtherDO::getMaterialName, reqVO.getMaterialName())
-                .eqIfPresent(MaterialOtherDO::getErpMaterialNumber, reqVO.getErpMaterialNumber())
+                .likeIfPresent(MaterialOtherDO::getErpMaterialNumber, reqVO.getErpMaterialNumber())
                 .likeIfPresent(MaterialOtherDO::getErpMaterialName, reqVO.getErpMaterialName())
                 .eqIfPresent(MaterialOtherDO::getUnit, reqVO.getUnit())
                 .eqIfPresent(MaterialOtherDO::getAbbreviation, reqVO.getAbbreviation())

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/TaxMapper.java

@@ -20,11 +20,11 @@ public interface TaxMapper extends BaseMapperX<TaxDO> {
                 .eqIfPresent(TaxDO::getType, reqVO.getType())
                 .eqIfPresent(TaxDO::getCategory, reqVO.getCategory())
                 .eqIfPresent(TaxDO::getTaxCoding, reqVO.getTaxCoding())
-                .eqIfPresent(TaxDO::getRemark, reqVO.getRemark())
+                .likeIfPresent(TaxDO::getRemark, reqVO.getRemark())
                 .eqIfPresent(TaxDO::getTax, reqVO.getTax())
                 .betweenIfPresent(TaxDO::getCreateTime, reqVO.getCreateTime())
                 .eqIfPresent(TaxDO::getIsEnable, reqVO.getIsEnable())
-                .eqIfPresent(TaxDO::getCustomerNumber, reqVO.getCustomerNumber())
+                .likeIfPresent(TaxDO::getCustomerNumber, reqVO.getCustomerNumber())
                 .likeIfPresent(TaxDO::getCustomerName, reqVO.getCustomerName())
                 .orderByDesc(TaxDO::getId));
     }

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/WarehouseMapper.java

@@ -17,7 +17,7 @@ public interface WarehouseMapper extends BaseMapperX<WarehouseDO> {
 
     default PageResult<WarehouseDO> selectPage(WarehousePageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<WarehouseDO>()
-                .eqIfPresent(WarehouseDO::getFactoryNumber, reqVO.getFactoryNumber())
+                .likeIfPresent(WarehouseDO::getFactoryNumber, reqVO.getFactoryNumber())
                 .likeIfPresent(WarehouseDO::getCpnName, reqVO.getCpnName())
                 .likeIfPresent(WarehouseDO::getErpFactoryName, reqVO.getErpFactoryName())
                 .eqIfPresent(WarehouseDO::getErpFactoryNumber, reqVO.getErpFactoryNumber())
@@ -26,8 +26,8 @@ public interface WarehouseMapper extends BaseMapperX<WarehouseDO> {
                 .betweenIfPresent(WarehouseDO::getCreateTime, reqVO.getCreateTime())
                 .likeIfPresent(WarehouseDO::getFactoryName, reqVO.getFactoryName())
                 .eqIfPresent(WarehouseDO::getIsEnable, reqVO.getIsEnable())
-                .eqIfPresent(WarehouseDO::getCompanyNumber, reqVO.getCompanyNumber())
+                .likeIfPresent(WarehouseDO::getCompanyNumber, reqVO.getCompanyNumber())
-                .eqIfPresent(WarehouseDO::getErpCoding, reqVO.getErpCoding())
+                .likeIfPresent(WarehouseDO::getErpCoding, reqVO.getErpCoding())
                 .likeIfPresent(WarehouseDO::getErpName, reqVO.getErpName())
                 .orderByDesc(WarehouseDO::getId));
     }

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TmplTpServiceImpl.java

@@ -393,12 +393,7 @@ public class TmplTpServiceImpl extends ServiceImpl<TmplTpMapper, TmplTpDO> imple
             String nodeId = node.getId().toString();
             String parentId = node.getPrnId() != null ? node.getPrnId().toString() : null;
 
-            // 如果是查询条件匹配的根节点
+            // 建立父子关系
-            if (rootIds.contains(nodeId)) {
-                roots.add(node);
-            }
-
-            // 如果有父节点且父节点在当前节点集合中，建立父子关系
             if (parentId != null && nodeMap.containsKey(parentId)) {
                 TmplTpTreeVO parent = nodeMap.get(parentId);
                 if (parent.getChildren() == null) {
@@ -408,14 +403,26 @@ public class TmplTpServiceImpl extends ServiceImpl<TmplTpMapper, TmplTpDO> imple
             }
         }
 
-        // 3. 对所有节点的子节点进行排序
+        // 3. 只将匹配的节点（rootIds）且没有父节点在结果集中的，作为根节点
+        for (String rootId : rootIds) {
+            TmplTpTreeVO node = nodeMap.get(rootId);
+            if (node != null) {
+                String parentId = node.getPrnId() != null ? node.getPrnId().toString() : null;
+                // 如果父节点不在当前结果集中，则作为根节点
+                if (parentId == null || !nodeMap.containsKey(parentId)) {
+                    roots.add(node);
+                }
+            }
+        }
+
+        // 4. 对所有节点的子节点进行排序
         nodeMap.values().forEach(node -> {
             if (node.getChildren() != null && !node.getChildren().isEmpty()) {
                 node.getChildren().sort(Comparator.comparing(TmplTpTreeVO::getSrt));
             }
         });
 
-        // 4. 对根节点排序
+        // 5. 对根节点排序
         roots.sort(Comparator.comparing(TmplTpTreeVO::getSrt));
 
         return roots;

zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/enums/purchaseorder/ErrorCodeConstants.java

@@ -17,4 +17,5 @@ public interface ErrorCodeConstants {
     ErrorCode PURCHASE_ORDER_STATUS_ERROR = new ErrorCode(1_008_001_020, "非法的订单状态");
     ErrorCode Sales_ORDER_NOT_EXISTS =  new ErrorCode(1_008_000_030, "销售订单不存在");
     ErrorCode Sales_ORD_DTL_NOT_EXISTS =  new ErrorCode(1_008_001_040, "销售订单明细不存在");
+    ErrorCode ORDER_DONT_SUBMIT = new ErrorCode(1_008_000_050, "该订单不支持审批");
 }