结算单价

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

@@ -105,6 +105,10 @@ public class StockSaleReceiptReport extends BaseModel<StockSaleReceiptReport> {
      * 结算重量（吨）
      */
     private Float settlementWeight;
+    /**
+     * 结算单价（元/吨）
+     */
+    private Float settlementPrice;
     /**
      * 应收金额（元/吨）
      */
@@ -193,6 +197,11 @@ public class StockSaleReceiptReport extends BaseModel<StockSaleReceiptReport> {
      */
     @TableField(exist = false)
     private String poundImg;
+    /**
+     * 修改重量1修改单价2
+     */
+    @TableField(exist = false)
+    private String flag;
 
 
     @Override

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

@@ -154,14 +154,27 @@ public class StockSaleReceiptReportServiceImpl extends ServiceImpl<StockSaleRece
         //查询销售出库报表
         StockSaleReceiptReport stockSaleReceiptReport1 = this.selectById(stockSaleReceiptReport.getId());
         if (stockSaleReceiptReport1 != null) {
-            stockSaleReceiptReport1.setSettlementWeight(stockSaleReceiptReport.getSettlementWeight());
-            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())));
-            stockSaleReceiptReport1.setAmountNotReceivable(stockSaleReceiptReport1.getAmountIngReceivable()-stockSaleReceiptReport1.getAmountEdReceivable());
-            //更改销售出库报表信息
-            this.updateById(stockSaleReceiptReport1);
-            return "OK";
+            //修改重量
+            if ("1".equals(stockSaleReceiptReport.getFlag())) {
+                stockSaleReceiptReport1.setSettlementWeight(stockSaleReceiptReport.getSettlementWeight());
+//            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())));
+                stockSaleReceiptReport1.setAmountIngReceivable(stockSaleReceiptReport.getSettlementWeight() * stockSaleReceiptReport1.getSettlementPrice());
+                stockSaleReceiptReport1.setAmountNotReceivable(stockSaleReceiptReport1.getAmountIngReceivable() - stockSaleReceiptReport1.getAmountEdReceivable());
+                //更改销售出库报表信息
+                this.updateById(stockSaleReceiptReport1);
+                return "OK";
+            }
+            //修改单价
+            else{
+                stockSaleReceiptReport1.setSettlementPrice(stockSaleReceiptReport.getSettlementPrice());
+                stockSaleReceiptReport1.setAmountIngReceivable(stockSaleReceiptReport1.getSettlementWeight() * stockSaleReceiptReport.getSettlementPrice());
+                stockSaleReceiptReport1.setAmountNotReceivable(stockSaleReceiptReport1.getAmountIngReceivable() - stockSaleReceiptReport1.getAmountEdReceivable());
+                //更改销售出库报表信息
+                this.updateById(stockSaleReceiptReport1);
+                return "OK";
+            }
         }
         return "NG";
     }

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

@@ -497,11 +497,13 @@ public class TranProcessInfoServiceImpl extends ServiceImpl<TranProcessInfoMappe
                                         stockSaleReceiptReport.setNetWeight(tranCarInfo.getUnloadNetWeight());
                                         stockSaleReceiptReport.setSettlementWeight(tranCarInfo.getUnloadNetWeight());
                                         if(contractManagementInfo.getUnitContractPrice()!=null) {
+                                            stockSaleReceiptReport.setSettlementPrice(Float.valueOf(String.valueOf(contractManagementInfo.getUnitContractPrice())));
                                             stockSaleReceiptReport.setAmountIngReceivable(tranCarInfo.getUnloadNetWeight() *
                                                     (Float.valueOf(String.valueOf(contractManagementInfo.getUnitContractPrice()))));
                                         }
                                         //随行就市
                                         else {
+                                            stockSaleReceiptReport.setSettlementPrice(tranCarInfo.getContractPrice());
                                             stockSaleReceiptReport.setAmountIngReceivable(tranCarInfo.getUnloadNetWeight() *tranCarInfo.getContractPrice());
                                         }
                                         stockSaleReceiptReport.setAmountEdReceivable(0.0f);
@@ -527,11 +529,13 @@ public class TranProcessInfoServiceImpl extends ServiceImpl<TranProcessInfoMappe
                                         stockSaleReceiptReport.setNetWeight(tranCarInfo.getUnloadNetWeight());
                                         stockSaleReceiptReport.setSettlementWeight(tranCarInfo.getUnloadNetWeight());
                                         if(contractManagementInfo.getUnitContractPrice()!=null) {
+                                            stockSaleReceiptReport.setSettlementPrice(Float.valueOf(String.valueOf(contractManagementInfo.getUnitContractPrice())));
                                             stockSaleReceiptReport.setAmountIngReceivable(tranCarInfo.getUnloadNetWeight() *
                                                     (Float.valueOf(String.valueOf(contractManagementInfo.getUnitContractPrice()))));
                                         }
                                         //随行就市
                                         else {
+                                            stockSaleReceiptReport.setSettlementPrice(tranCarInfo.getContractPrice());
                                             stockSaleReceiptReport.setAmountIngReceivable(tranCarInfo.getUnloadNetWeight() *tranCarInfo.getContractPrice());
                                         }
                                         stockSaleReceiptReport.setAmountEdReceivable(0.0f);
@@ -558,11 +562,13 @@ public class TranProcessInfoServiceImpl extends ServiceImpl<TranProcessInfoMappe
                                         stockSaleReceiptReport.setNetWeight(tranCarInfo.getUnloadNetWeight());
                                         stockSaleReceiptReport.setSettlementWeight(tranCarInfo.getUnloadNetWeight());
                                         if(contractManagementInfo.getUnitContractPrice()!=null) {
+                                            stockSaleReceiptReport.setSettlementPrice(Float.valueOf(String.valueOf(contractManagementInfo.getUnitContractPrice())));
                                             stockSaleReceiptReport.setAmountIngReceivable(tranCarInfo.getUnloadNetWeight() *
                                                     (Float.valueOf(String.valueOf(contractManagementInfo.getUnitContractPrice()))));
                                         }
                                         //随行就市
                                         else {
+                                            stockSaleReceiptReport.setSettlementPrice(tranCarInfo.getContractPrice());
                                             stockSaleReceiptReport.setAmountIngReceivable(tranCarInfo.getUnloadNetWeight() *tranCarInfo.getContractPrice());
                                         }
                                         stockSaleReceiptReport.setAmountEdReceivable(0.0f);
@@ -590,11 +596,13 @@ public class TranProcessInfoServiceImpl extends ServiceImpl<TranProcessInfoMappe
                                         stockSaleReceiptReport.setNetWeight(tranCarInfo.getUnloadNetWeight());
                                         stockSaleReceiptReport.setSettlementWeight(tranCarInfo.getUnloadNetWeight());
                                         if(contractManagementInfo.getUnitContractPrice()!=null) {
+                                            stockSaleReceiptReport.setSettlementPrice(Float.valueOf(String.valueOf(contractManagementInfo.getUnitContractPrice())));
                                             stockSaleReceiptReport.setAmountIngReceivable(tranCarInfo.getUnloadNetWeight() *
                                                     (Float.valueOf(String.valueOf(contractManagementInfo.getUnitContractPrice()))));
                                         }
                                         //随行就市
                                         else {
+                                            stockSaleReceiptReport.setSettlementPrice(tranCarInfo.getContractPrice());
                                             stockSaleReceiptReport.setAmountIngReceivable(tranCarInfo.getUnloadNetWeight() *tranCarInfo.getContractPrice());
                                         }
                                         stockSaleReceiptReport.setAmountEdReceivable(0.0f);

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

@@ -789,6 +789,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                             stockSaleReceiptReport.setGrossWeight(warehouseInOutInfo.getGrossWeight());
                             stockSaleReceiptReport.setTare(warehouseInOutInfo.getTare());
                             stockSaleReceiptReport.setNetWeight(-warehouseInOutInfo.getNetWeight());
+                            stockSaleReceiptReport.setSettlementPrice(Float.valueOf(String.valueOf(contractManagementInfo.getUnitContractPrice())));
                             stockSaleReceiptReport.setReturnDate(warehouseInOutInfo.getInOutDate());
                             stockSaleReceiptReport.setAmountIngReceivable(-warehouseInOutInfo.getNetWeight() * Float.valueOf(String.valueOf(contractManagementInfo.getUnitContractPrice())));
                             stockSaleReceiptReport.setSettlementWeight(-warehouseInOutInfo.getNetWeight());
@@ -1018,7 +1019,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                             stockSaleReceiptReport.setNetWeight(warehouseInOutInfo.getNetWeight());
                             stockSaleReceiptReport.setDeliveryDate(warehouseInOutInfo.getInOutDate());
                             stockSaleReceiptReport.setSettlementWeight(warehouseInOutInfo.getNetWeight());
-
+                            stockSaleReceiptReport.setSettlementPrice(Float.valueOf(String.valueOf(contractManagementInfo.getUnitContractPrice())));
                             stockSaleReceiptReport.setAmountIngReceivable(warehouseInOutInfo.getNetWeight() *
                                     (Float.valueOf(String.valueOf(contractManagementInfo.getUnitContractPrice()))));
                             stockSaleReceiptReport.setAmountEdReceivable(0.0f);

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

@@ -63,6 +63,7 @@
         gross_weight as grossWeight,
         tare as tare,
         settlement_weight AS settlementWeight,
+        settlement_price AS settlementPrice,
         amount_ing_receivable as amountIngReceivable,
         amount_ed_receivable as amountEdReceivable,
         amount_not_receivable as amountNotReceivable,