杰生

hx-service/storage/src/main/java/com/fjhx/supplier/controller/SupplierController.java

@@ -2,11 +2,13 @@ package com.fjhx.supplier.controller;
 
 import com.fjhx.entity.supplier.Supplier;
 import com.fjhx.supplier.service.SupplierService;
+import com.fjhx.utils.BigDecimalUtil;
 import org.springblade.common.utils.ListPageMap;
 import org.springblade.core.tool.api.R;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 
@@ -261,5 +263,12 @@ public class SupplierController {
         return R.success(result);
     }
 
+    @PostMapping("/paymentGetBackAmount")
+    public R paymentGetBackAmount(@RequestBody Map<String, String> condition) {
+        String purchaseBillNo = condition.get("purchaseBillNo");
+        BigDecimal amount = supplierService.paymentGetBackAmount(purchaseBillNo);
+        return R.data(BigDecimalUtil.keepDecimals(amount, 2));
+    }
+
 }
 

hx-service/storage/src/main/java/com/fjhx/supplier/mapper/SupplierMapper.java

@@ -5,6 +5,7 @@ import com.fjhx.entity.supplier.Supplier;
 import org.apache.ibatis.annotations.Param;
 import org.springblade.core.tenant.annotation.TenantIgnore;
 
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 
@@ -165,5 +166,10 @@ public interface SupplierMapper extends BaseMapper<Supplier> {
     @TenantIgnore
     List<Map<String, Object>> getSafetyWarnDayList();
 
+    @TenantIgnore
     List<Map<String, Object>> getSafetyWarnDayBySupplier(@Param("supplierId") String supplierId);
+
+    @TenantIgnore
+    BigDecimal paymentGetBackAmount(@Param("purchaseBillNo") String purchaseBillNo);
+
 }

hx-service/storage/src/main/java/com/fjhx/supplier/mapper/SupplierMapper.xml

@@ -337,6 +337,15 @@
         where sp.FactoryId = #{supplierId}
     </select>
 
+    <select id="paymentGetBackAmount" resultType="java.math.BigDecimal">
+        SELECT sum(asod.Amount) - sum(ifnull(app.BackAmount, 0)) AS BackAmount
+        FROM apply_stockoutdetail asod
+                 LEFT JOIN apply_purchase_pay app ON asod.BalancePurBillNo = app.PurchaseBillNo
+            AND app.ApplyPayState = 2
+        WHERE BalancePurBillNo = #{purchaseBillNo}
+        GROUP BY BalancePurBillNo
+    </select>
+
 
     <sql id="warningCount_filed">
         SELECT count(1)

hx-service/storage/src/main/java/com/fjhx/supplier/service/SupplierService.java

@@ -3,6 +3,7 @@ package com.fjhx.supplier.service;
 import com.fjhx.base.BaseService;
 import com.fjhx.entity.supplier.Supplier;
 
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 
@@ -155,4 +156,6 @@ public interface SupplierService extends BaseService<Supplier> {
     List<Map<String, Object>> getSafetyWarnDayList();
 
     List<Map<String, Object>> getSafetyWarnDayBySupplier(String supplierId);
+
+    BigDecimal paymentGetBackAmount(String purchaseBillNo);
 }

hx-service/storage/src/main/java/com/fjhx/supplier/service/impl/SupplierServiceImpl.java

@@ -394,4 +394,9 @@ public class SupplierServiceImpl extends ServiceImpl<SupplierMapper, Supplier> i
         return baseMapper.getSafetyWarnDayBySupplier(supplierId);
     }
 
+    @Override
+    public BigDecimal paymentGetBackAmount(String purchaseBillNo) {
+        return baseMapper.paymentGetBackAmount(purchaseBillNo);
+    }
+
 }