1

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

@@ -125,6 +125,10 @@ public class StockSaleReceiptReport extends BaseModel<StockSaleReceiptReport> {
      * 结算重量（吨）
      */
     private Double settlementWeight;
+    /**
+     * 手动修改结算重量标识(1是)
+     */
+    private String manualFlag;
     /**
      * 卸车重量（吨）
      */

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

@@ -157,6 +157,7 @@ public class StockSaleReceiptReportServiceImpl extends ServiceImpl<StockSaleRece
             //修改重量
             if ("1".equals(stockSaleReceiptReport.getFlag())) {
                 stockSaleReceiptReport1.setSettlementWeight(stockSaleReceiptReport.getSettlementWeight());
+                stockSaleReceiptReport1.setManualFlag("1");
 //            ContractManagementInfo contractManagementInfo = contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
 //                    .eq("contract_no", stockSaleReceiptReport1.getContractNo()).eq("delete_flag", "0"));
 //            stockSaleReceiptReport1.setAmountIngReceivable(stockSaleReceiptReport.getSettlementWeight()* Float.valueOf(String.valueOf(contractManagementInfo.getUnitContractPrice())));

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

@@ -56,7 +56,7 @@
         IFNULL(i.deduction_weight,0) as deductionWeight,
         s.gross_weight as grossWeight,
         s.tare as tare,
-        case when m.settlement_weight_method = '1' then s.net_weight else IFNULL(i.unload_net_weight,0)-IFNULL(i.deduction_weight,0) end as settlementWeight,
+        case when s.manual_flag = '1' then s.settlement_weight when m.settlement_weight_method = '1' then s.net_weight else IFNULL(i.unload_net_weight,0)-IFNULL(i.deduction_weight,0) end as settlementWeight,
         s.settlement_price AS settlementPrice,
         ROUND(s.amount_ing_receivable,2) as amountIngReceivable,
         ROUND(s.amount_ed_receivable,2) as amountEdReceivable,