1

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/WarehousingOrder.java

@@ -190,6 +190,10 @@ public class WarehousingOrder extends BaseModel<WarehousingOrder> {
      * 费用
      */
     private Double amountMoney;
+    /**
+     * 请款重量
+     */
+    private Double requestWeight;
     /**
      * 请款
      */

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/WarehousingOrderRecord.java

@@ -47,6 +47,10 @@ public class WarehousingOrderRecord extends BaseModel<WarehousingOrderRecord> {
      * 本次请款金额(元)
      */
     private Double paymentRequestAmount;
+    /**
+     * 本次请款重量
+     */
+    private Double paymentRequestWeight;
     /**
      * 审核流id
      */

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/WarehousingOrderServiceImpl.java

@@ -1574,6 +1574,7 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
                     warehousingOrder1.setAmountNotPayable(warehousingOrder1.getAmountNotPayable() - warehousingOrder1.getRequestFunds());
                     warehousingOrder1.setAmountEdPayable(warehousingOrder1.getAmountEdPayable() + warehousingOrder1.getRequestFunds());
                     warehousingOrder1.setRequestFunds(0d);
+                    warehousingOrder1.setRequestWeight(0d);
                     warehousingOrder1.setAccountPaymentDate(warehousingOrder.getAccountPaymentDate());
                     warehousingOrder1.setPaymentVoucherNumber(warehousingOrder.getPaymentVoucherNumber());
                     warehousingOrder1.setStatusFlag("");
@@ -1744,8 +1745,9 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
                                 warehousingOrderRecord.setCreateUserId(AuthSecurityUtils.getCurrentUserId());
                                 warehousingOrderRecord.setOrderId(warehousingOrder2.getId());
                                 warehousingOrderRecord.setBatchId(warehousingOrder2.getBatchId());
-                                warehousingOrderRecord.setAveragePurchasePrice(warehousingOrder2.getGrainFund() / warehousingOrder2.getInWarehouseWeight());
+                                warehousingOrderRecord.setAveragePurchasePrice(warehousingOrder2.getRequestFunds() / warehousingOrder2.getRequestWeight());
                                 warehousingOrderRecord.setPaymentRequestAmount(warehousingOrder2.getRequestFunds());
+                                warehousingOrderRecord.setPaymentRequestWeight(warehousingOrder2.getRequestWeight());
                                 warehousingOrderRecord.setWorkflowId(warehousingOrder2.getWorkflowId());
                                 warehousingOrderRecordService.insert(warehousingOrderRecord);
                             }
@@ -1779,8 +1781,9 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
                                             .eq("order_id", warehousingOrder2.getId()).eq("delete_flag", "0"));
                                     warehousingOrderRecord.setOrderId(warehousingOrder2.getId());
                                     warehousingOrderRecord.setBatchId(warehousingOrder2.getBatchId());
-                                    warehousingOrderRecord.setAveragePurchasePrice(warehousingOrder2.getGrainFund() / warehousingOrder2.getInWarehouseWeight());
+                                    warehousingOrderRecord.setAveragePurchasePrice(warehousingOrder2.getRequestFunds() / warehousingOrder2.getRequestWeight());
                                     warehousingOrderRecord.setPaymentRequestAmount(warehousingOrder2.getRequestFunds());
+                                    warehousingOrderRecord.setPaymentRequestWeight(warehousingOrder2.getRequestWeight());
                                     warehousingOrderRecordService.updateById(warehousingOrderRecord);
                                 }
                                 // 设置状态 已提交审核
@@ -1803,8 +1806,9 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
                                         .eq("order_id", warehousingOrder2.getId()).eq("delete_flag", "0"));
                                 warehousingOrderRecord.setOrderId(warehousingOrder2.getId());
                                 warehousingOrderRecord.setBatchId(warehousingOrder2.getBatchId());
-                                warehousingOrderRecord.setAveragePurchasePrice(warehousingOrder2.getGrainFund() / warehousingOrder2.getInWarehouseWeight());
+                                warehousingOrderRecord.setAveragePurchasePrice(warehousingOrder2.getRequestFunds() / warehousingOrder2.getRequestWeight());
                                 warehousingOrderRecord.setPaymentRequestAmount(warehousingOrder2.getRequestFunds());
+                                warehousingOrderRecord.setPaymentRequestWeight(warehousingOrder2.getRequestWeight());
                                 warehousingOrderRecordService.updateById(warehousingOrderRecord);
                             }
                             workflowService.activateInstance(warehousingOrder1.getWorkflowId(), warehousingOrder1.getBatchId());
@@ -2408,7 +2412,7 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
             WarehousingOrder warehousingOrder1 = dataList.get(i);
             //请款累计和
             requestFundsTotal = requestFundsTotal + warehousingOrder1.getRequestFunds();
-            inWarehouseWeightTotal = inWarehouseWeightTotal + warehousingOrder1.getInWarehouseWeight();
+            inWarehouseWeightTotal = inWarehouseWeightTotal + warehousingOrder1.getRequestWeight();
             //查询详细数据
             Map<String, Object> pageView1 = new HashMap<>();
             //  关联ID
@@ -2493,7 +2497,7 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
             WarehousingOrder warehousingOrder1 = dataList.get(i);
             //请款累计和
             requestFundsTotal = requestFundsTotal + warehousingOrder1.getRequestFunds();
-            inWarehouseWeightTotal = inWarehouseWeightTotal + warehousingOrder1.getInWarehouseWeight();
+            inWarehouseWeightTotal = inWarehouseWeightTotal + warehousingOrder1.getRequestWeight();
             //查询详细数据
             Map<String, Object> pageView1 = new HashMap<>();
             //  关联ID

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/workflow/WarehousingOrderProvider.java

@@ -54,7 +54,7 @@ public class WarehousingOrderProvider implements BeanWorkFlowProvider {
 		Double inWarehouseWeight = 0d;
 		for(int i=0;i<list.size();i++){
 			requestFunds =requestFunds + list.get(i).getRequestFunds();
-			inWarehouseWeight =inWarehouseWeight + list.get(i).getInWarehouseWeight();
+			inWarehouseWeight =inWarehouseWeight + list.get(i).getRequestWeight();
 		}
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy年MM月dd日 HH:mm");
 		String staffName = "XXX";

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/WarehousingOrderMapper.xml

@@ -103,6 +103,7 @@
         w.storage_fee as storageFee,
         w.interest,
         w.request_funds as requestFunds,
+        w.request_weight as requestWeight,
         w.request_person as requestPerson,
         w.request_date as requestDate,
         w.in_type as inType,
@@ -220,6 +221,7 @@
         w.storage_fee as storageFee,
         w.interest,
         wor.payment_request_amount as requestFunds,
+        wor.payment_request_weight as requestWeight,
         w.request_person as requestPerson,
         w.request_date as requestDate,
         w.in_type as inType,