pdf生成

bladex-saas-project/saas-business-tradeerp/src/main/java/com/fjhx/paymentgoods/mapper/PaymentGoodsDetailsMapper.java

@@ -21,6 +21,7 @@ import com.fjhx.paymentgoods.entity.PaymentGoodsDetails;
 import org.apache.ibatis.annotations.Param;
 import org.springblade.core.tenant.annotation.TenantIgnore;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -40,4 +41,12 @@ public interface PaymentGoodsDetailsMapper extends BaseMapper<PaymentGoodsDetail
      */
     @TenantIgnore
     List<PaymentGoodsDetails> getByPurchaseCodes(@Param("purchaseCodes") List<String> purchaseCodes, @Param("tenantId") String tenantId);
+
+    /**
+     * 通过采购合同ID获取总付款金额
+     * @param purchaseContractId
+     * @return
+     */
+    @TenantIgnore
+    BigDecimal getSumMoney(@Param("purchaseContractId") String purchaseContractId);
 }

bladex-saas-project/saas-business-tradeerp/src/main/java/com/fjhx/paymentgoods/mapper/PaymentGoodsDetailsMapper.xml

@@ -33,4 +33,14 @@
             </foreach>
     </select>
 
+    <select id="getSumMoney" resultType="java.math.BigDecimal">
+        SELECT
+            IFNULL(sum( t1.money ),0) AS money
+        FROM
+            t_erp_payment_goods_details t1
+                LEFT JOIN t_erp_payment_goods t2 ON t1.payment_goods_id = t2.id
+        WHERE
+            t2.`status` >= 30
+          AND t1.purchase_contract_id = #{purchaseContractId}
+    </select>
 </mapper>

bladex-saas-project/saas-business-tradeerp/src/main/java/com/fjhx/paymentgoods/service/IPaymentGoodsDetailsService.java

@@ -19,6 +19,7 @@ package com.fjhx.paymentgoods.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fjhx.paymentgoods.entity.PaymentGoodsDetails;
 
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 
@@ -61,4 +62,11 @@ public interface IPaymentGoodsDetailsService extends IService<PaymentGoodsDetail
      * @return
      */
     Map<String, List<PaymentGoodsDetails>> getByPurchaseCodesToMap(List<String> purchaseCodes);
+
+    /**
+     * 通过采购合同ID获取总付款金额
+     * @param purchaseContractId
+     * @return
+     */
+    BigDecimal getSumMoney(String purchaseContractId);
 }

bladex-saas-project/saas-business-tradeerp/src/main/java/com/fjhx/paymentgoods/service/impl/PaymentGoodsDetailsServiceImpl.java

@@ -25,6 +25,7 @@ import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.utils.CollectionUtil;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -97,4 +98,14 @@ public class PaymentGoodsDetailsServiceImpl extends BasicsServiceImpl<PaymentGoo
         }
         return list.stream().collect(Collectors.groupingBy(PaymentGoodsDetails::getPurchaseContractCode));
     }
+
+    /**
+     * 通过采购合同ID获取总付款金额
+     * @param purchaseContractId
+     * @return
+     */
+    @Override
+    public BigDecimal getSumMoney(String purchaseContractId) {
+        return baseMapper.getSumMoney(purchaseContractId);
+    }
 }

bladex-saas-project/saas-business-tradeerp/src/main/java/com/fjhx/paymentgoods/service/impl/PaymentGoodsFlowServiceImpl.java

@@ -190,11 +190,11 @@ public class PaymentGoodsFlowServiceImpl implements IPaymentGoodsFlowService {
             BigDecimal purchasePrice = purchaseContract.getPurchasePrice();
 
             // 查询已付金额
-            QueryWrapper<PaymentGoodsDetails> wrapper = new QueryWrapper<>();
-            wrapper.select("sum(money) as money");
-            wrapper.lambda().eq(PaymentGoodsDetails::getPurchaseContractId, purchaseContractId);
-            PaymentGoodsDetails paymentGoodsDetails = paymentGoodsDetailsService.getOne(wrapper);
-            BigDecimal payMoney = paymentGoodsDetails == null ? BigDecimal.ZERO : paymentGoodsDetails.getMoney();
+//            QueryWrapper<PaymentGoodsDetails> wrapper = new QueryWrapper<>();
+//            wrapper.select("sum(money) as money");
+//            wrapper.lambda().eq(PaymentGoodsDetails::getPurchaseContractId, purchaseContractId);
+//            PaymentGoodsDetails paymentGoodsDetails = paymentGoodsDetailsService.getOne(wrapper);
+            BigDecimal payMoney = paymentGoodsDetailsService.getSumMoney(purchaseContractId);
 
             // 判断合同金额不能大于总付款金额
             if (payMoney.add(money).compareTo(purchasePrice) > 0) {

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 = "139.9.100.1:8848";
+	String NACOS_ADDR = "121.37.194.75: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 = "192.168.0.67";
+    String PROD_IP = "121.37.194.75";
 
     /**
      * nacos dev 地址