资金日报表BUG

bladex-saas-project/saas-business-tradeerp/src/main/java/com/fjhx/fundAccount/service/impl/FundAccountDetailServiceImpl.java

@@ -1354,7 +1354,7 @@ public class FundAccountDetailServiceImpl extends ServiceImpl<FundAccountDetailM
                             detail.setSterlingIncome(income);
                             detail.setSterlingExpenditure(expenditure);
 
-                            BigDecimal sterlingAmount = item.getEuroAmount();
+                            BigDecimal sterlingAmount = item.getSterlingAmount();
                             if (sterlingAmount != null) {
                                 if (income != null) {
                                     sterlingAmount = sterlingAmount.subtract(income);

bladex-saas-project/saas-business-tradeerp/src/main/java/com/fjhx/purchase/mapper/PurchaseContractMapper.xml

@@ -145,6 +145,9 @@
             <if test="code neq null and code neq ''">
                 AND (INSTR(t1.`code`, #{code}) > 0)
             </if>
+            <if test="supplyId neq null and supplyId neq ''">
+                AND t1.supply_id = #{supplyId}
+            </if>
 
             <if test="contractCode neq null and contractCode neq ''">
                 AND (INSTR(t1.contract_code, #{contractCode}) > 0)

bladex-saas-project/saas-business-tradeerp/src/main/java/com/fjhx/purchase/service/impl/PurchaseContractServiceImpl.java

@@ -144,7 +144,6 @@ public class PurchaseContractServiceImpl extends BasicsServiceImpl<PurchaseContr
     @Autowired
     private IChargeProjectService chargeProjectService;
 
-
     /**
      * 列表
      *

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

@@ -177,7 +177,7 @@ public class CodeRuleUtil {
                                 .orderByDesc(Contract::getCode)
                                 .last("limit 1")
                         );
-
+                        contract.setCode(contract.getCode().replace("(L)",""));
                         count = Convert.toInt(contract.getCode().replace("EHSD23", ""));
 
                     } else {

bladex-tool/blade-core-launch/src/main/java/org/springblade/core/launch/constant/NacosConstant.java

@@ -11,7 +11,7 @@ public interface NacosConstant {
 	 */
 //	String NACOS_ADDR = "127.0.0.1:8848";
 	String NACOS_ADDR = "139.9.184.42:8848";
-//	String NACOS_ADDR = "121.37.194.75:8848";
+//	String NACOS_ADDR = "139.9.184.42:8848"";
 
 	/**
 	 * nacos 配置前缀

bladex/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java

@@ -42,7 +42,7 @@ public interface LauncherConstant {
      */
     String DEV_IP = "127.0.0.1";
     String TEST_IP = "139.9.184.42";
-    String PROD_IP = "121.37.194.75";
+    String PROD_IP = "139.9.184.42";
 
     /**
      * nacos dev 地址