完成产品编号自动生成

添加OA请款 核销字段

.idea/compiler.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
+    <option name="BUILD_PROCESS_HEAP_SIZE" value="2048" />
     <annotationProcessing>
       <profile default="true" name="Default" enabled="true" />
       <profile name="Maven default annotation processors profile" enabled="true">
@@ -99,20 +100,20 @@
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
         <outputRelativeToContentRoot value="true" />
         <processorPath useClasspath="false">
-          <entry name="D:/relyOn/org/hibernate/validator/hibernate-validator-annotation-processor/6.0.13.Final/hibernate-validator-annotation-processor-6.0.13.Final.jar" />
-          <entry name="D:/relyOn/org/hibernate/validator/hibernate-validator/6.0.13.Final/hibernate-validator-6.0.13.Final.jar" />
-          <entry name="D:/relyOn/javax/validation/validation-api/2.0.1.Final/validation-api-2.0.1.Final.jar" />
-          <entry name="D:/relyOn/org/jboss/logging/jboss-logging/3.3.2.Final/jboss-logging-3.3.2.Final.jar" />
-          <entry name="D:/relyOn/com/fasterxml/classmate/1.3.4/classmate-1.3.4.jar" />
-          <entry name="D:/relyOn/org/hibernate/validator/hibernate-validator-test-utils/6.0.13.Final/hibernate-validator-test-utils-6.0.13.Final.jar" />
-          <entry name="D:/relyOn/org/testng/testng/6.8/testng-6.8.jar" />
-          <entry name="D:/relyOn/junit/junit/4.10/junit-4.10.jar" />
-          <entry name="D:/relyOn/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar" />
-          <entry name="D:/relyOn/org/beanshell/bsh/2.0b4/bsh-2.0b4.jar" />
-          <entry name="D:/relyOn/com/beust/jcommander/1.27/jcommander-1.27.jar" />
-          <entry name="D:/relyOn/org/yaml/snakeyaml/1.6/snakeyaml-1.6.jar" />
-          <entry name="D:/relyOn/joda-time/joda-time/2.9.7/joda-time-2.9.7.jar" />
-          <entry name="D:/relyOn/javax/money/money-api/1.0.1/money-api-1.0.1.jar" />
+          <entry name="D:/apache-maven-3.8.6/repository/org/hibernate/validator/hibernate-validator-annotation-processor/6.0.13.Final/hibernate-validator-annotation-processor-6.0.13.Final.jar" />
+          <entry name="D:/apache-maven-3.8.6/repository/org/hibernate/validator/hibernate-validator/6.0.13.Final/hibernate-validator-6.0.13.Final.jar" />
+          <entry name="D:/apache-maven-3.8.6/repository/javax/validation/validation-api/2.0.1.Final/validation-api-2.0.1.Final.jar" />
+          <entry name="D:/apache-maven-3.8.6/repository/org/jboss/logging/jboss-logging/3.3.2.Final/jboss-logging-3.3.2.Final.jar" />
+          <entry name="D:/apache-maven-3.8.6/repository/com/fasterxml/classmate/1.3.4/classmate-1.3.4.jar" />
+          <entry name="D:/apache-maven-3.8.6/repository/org/hibernate/validator/hibernate-validator-test-utils/6.0.13.Final/hibernate-validator-test-utils-6.0.13.Final.jar" />
+          <entry name="D:/apache-maven-3.8.6/repository/org/testng/testng/6.8/testng-6.8.jar" />
+          <entry name="D:/apache-maven-3.8.6/repository/junit/junit/4.10/junit-4.10.jar" />
+          <entry name="D:/apache-maven-3.8.6/repository/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar" />
+          <entry name="D:/apache-maven-3.8.6/repository/org/beanshell/bsh/2.0b4/bsh-2.0b4.jar" />
+          <entry name="D:/apache-maven-3.8.6/repository/com/beust/jcommander/1.27/jcommander-1.27.jar" />
+          <entry name="D:/apache-maven-3.8.6/repository/org/yaml/snakeyaml/1.6/snakeyaml-1.6.jar" />
+          <entry name="D:/apache-maven-3.8.6/repository/joda-time/joda-time/2.9.7/joda-time-2.9.7.jar" />
+          <entry name="D:/apache-maven-3.8.6/repository/javax/money/money-api/1.0.1/money-api-1.0.1.jar" />
         </processorPath>
         <module name="blade-core-auto" />
       </profile>

.idea/misc.xml

@@ -8,5 +8,5 @@
       </list>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="corretto-1.8" project-jdk-type="JavaSDK" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
 </project>

bladex-saas-project/saas-business-tradeerp/src/main/java/com/fjhx/funds/v2/service/impl/RequestFundsV2ServiceImpl.java

@@ -218,6 +218,11 @@ public class RequestFundsV2ServiceImpl extends BasicsServiceImpl<RequestFundsV2M
                     Company company = companyMap.get(v2.getCompanyId());
                     v2.setCompanyName(company.getNameChinese());
                 }
+
+                //核销状态显示
+                if(v2.getPaymentRequestType().equals("10")){
+                    v2.setVerificationStatus("预支（待核销）");
+                }
             }
         }
         return list;

bladex-saas-project/saas-business-tradeerp/src/main/java/com/fjhx/product/service/impl/ProductServiceImpl.java

@@ -14,6 +14,7 @@ import com.fjhx.product.enums.ProductCategoryType;
 import com.fjhx.product.mapper.ProductMapper;
 import com.fjhx.product.service.IProductCategoryService;
 import com.fjhx.product.service.IProductService;
+import com.fjhx.utils.CodeEnum;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -306,6 +307,8 @@ public class ProductServiceImpl extends BasicsServiceImpl<ProductMapper, Product
     @Transactional(rollbackFor = {Exception.class})
     @Override
     public void addCompanyProduct(Product entity) {
+        //自动生成编码
+        entity.setCode(CodeEnum.PRODUCT.getCode(entity.getCode()));
         //（云仓）出入库规则：0、不启用；1、一物一码；2、一物一码&先入先出',
         if (Func.isEmpty(entity.getFirstInFirstOut())) {
             entity.setFirstInFirstOut(YesOrNoEnum.NO.getKey());

bladex-saas-project/saas-business-tradeerp/src/main/java/com/fjhx/track/service/impl/TrackServiceImpl.java

@@ -19,16 +19,22 @@ package com.fjhx.track.service.impl;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.common.attachment.IAttachmentApi;
+import com.fjhx.purchase.entity.PurchaseContract;
+import com.fjhx.purchase.service.IPurchaseContractService;
 import com.fjhx.track.entity.Track;
 import com.fjhx.track.mapper.TrackMapper;
 import com.fjhx.track.service.ITrackService;
+import com.fjhx.tracknode.service.ITrackNodeService;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springblade.common.constant.AttachmentConstant;
 import org.springblade.common.constant.UserConstants;
 import org.springblade.common.enums.YesOrNoEnum;
 import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.tool.api.R;
 import org.springblade.system.attachment.entity.Attachment;
+import org.springblade.system.entity.DictBiz;
+import org.springblade.system.feign.IDictBizClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -49,6 +55,12 @@ public class TrackServiceImpl extends ServiceImpl<TrackMapper, Track> implements
     @Autowired
     private IAttachmentApi iAttachmentApi;
 
+    @Autowired
+    private IPurchaseContractService iPurchaseContractService;
+
+    @Autowired
+    private IDictBizClient iDictBizClient;
+
     @Override
     public List<Track> findTrackTypeATime(String selectTrackByProductId) {
         List<Track> list = baseMapper.selectTrackByProductId(selectTrackByProductId);
@@ -88,6 +100,9 @@ public class TrackServiceImpl extends ServiceImpl<TrackMapper, Track> implements
             }
             iAttachmentApi.batchInsert(track.getAttachment());
         }
+        //编辑跟单后发送消息给用户
+        PurchaseContract purchaseContract = iPurchaseContractService.getById(track.getPurchaseContractId());
+        System.out.println(purchaseContract.getContractCode()+" 合同有新的跟进记录（节点："+iDictBizClient.getValue("purchase_track_type",track.getTrackType())+"），请及时查看");
         return true;
     }
 

bladex-saas-project/saas-business-tradeerp/src/main/java/com/fjhx/utils/CodeEnum.java

@@ -5,6 +5,7 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.extra.spring.SpringUtil;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.fjhx.product.service.IProductService;
 import com.fjhx.service.service.ServiceContractService;
 
 import java.util.Date;
@@ -14,7 +15,7 @@ public enum CodeEnum {
 
     // 供应商
     SERVICE_CONTRACT("S", null, "code", 5, ServiceContractService.class),
-
+    PRODUCT("P", null, "code", 5, IProductService.class),
     ;
 
     CodeEnum(String prefix, String dateFormat, String codeFieldName, Integer length, Class<? extends IService<?>> serviceCls) {

bladex-saas-project/saas-entity/src/main/java/com/fjhx/funs/v2/RequestFundsV2.java

@@ -53,7 +53,7 @@ public class RequestFundsV2 extends BasicsEntity {
     private String advanceReceiptId;
 
     /**
-     * 请款类型 ： 0:预支，1:报销，2:核销
+     * 请款类型 ： 10:预支，1:报销，2:核销
      */
     private String paymentRequestType;
 
@@ -263,4 +263,10 @@ public class RequestFundsV2 extends BasicsEntity {
      */
     @TableField(exist = false)
     private String capitalMatter;
+
+    /**
+    * 核销状态
+    */
+    @TableField(exist = false)
+    private String verificationStatus;
 }