1

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/PurchasePriceController.java

@@ -96,5 +96,15 @@ public class PurchasePriceController {
     public Float dryGrainPrice(PurchasePrice purchasePrice) {
         return iPurchasePriceService.dryGrainPrice(purchasePrice);
     }
+
+    /**
+     * 根据仓库名货名查仓库设置信息
+     * @param purchasePrice
+     * @return
+     */
+    @GetMapping("/selectByName")
+    public PurchasePrice selectByName(@RequestBody PurchasePrice purchasePrice) {
+        return iPurchasePriceService.selectByName(purchasePrice);
+    }
 }
 

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

@@ -154,7 +154,7 @@ public class TranSettlementReport extends BaseModel<TranSettlementReport> {
     /**
      * 合计应付(元)
      */
-        private Double totalPayable;
+    private Double totalPayable;
     /**
      * 税点(元)
      */

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

@@ -98,6 +98,10 @@ public class WarehousingOrder extends BaseModel<WarehousingOrder> {
      * 货名
      */
     private String goodsName;
+    /**
+     * 加权水分
+     */
+    private Double weightedMoisture;
     /**
      * 入库重量（吨）
      */

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

@@ -65,6 +65,12 @@ public interface IPurchasePriceService extends IService<PurchasePrice> {
      * @return
      */
     Float dryGrainPrice(PurchasePrice purchasePrice);
+    /**
+     * 根据仓库名货名查仓库设置信息
+     * @param purchasePrice
+     * @return
+     */
+    PurchasePrice selectByName(PurchasePrice purchasePrice);
 
 
 }

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

@@ -350,4 +350,13 @@ public class PurchasePriceServiceImpl extends ServiceImpl<PurchasePriceMapper, P
         }
         return dryGrainPrice;
     }
+
+    @Override
+    public PurchasePrice selectByName(PurchasePrice purchasePrice) {
+        PurchasePrice purchasePrice1=this.selectOne(new EntityWrapper<PurchasePrice>()
+                .eq("warehouse_id",purchasePrice.getWarehouseId())
+                .eq("goods_name",purchasePrice.getGoodsName())
+                .eq("status_flag","3"));
+        return purchasePrice1;
+    }
 }

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

@@ -336,7 +336,7 @@ public class TranProcessInfoServiceImpl extends ServiceImpl<TranProcessInfoMappe
                                 //合计应付
                                 tranSettlementReport.setTotalPayable(tranSettlementReport.getAmountActuallyPaid()+tranSettlementReport.getTaxPoint());
                                 //未付
-                                tranSettlementReport.setAmountNotPayable(Float.valueOf(tranCarInfo.getTranPrice()) * tranSettlementReport.getSettlementWeight());
+                                tranSettlementReport.setAmountNotPayable(Float.valueOf(String.valueOf(tranSettlementReport.getTotalPayable())));
                                 tranSettlementReport.setTranCarNo(tranCarInfo.getTranCarNo());
                                 tranSettlementReport.setLoadingWeight(tranCarInfo.getLoadNetWeight());
                                 tranSettlementReport.setLoadingImg(tranCarInfo.getLoadPoundImg());
@@ -484,6 +484,8 @@ public class TranProcessInfoServiceImpl extends ServiceImpl<TranProcessInfoMappe
                                     tranSettlementReport1.setTaxPoint(tranSettlementReport1.getAmountActuallyPaid()/0.946*0.054);
                                     //合计应付
                                     tranSettlementReport1.setTotalPayable(tranSettlementReport1.getAmountActuallyPaid()+tranSettlementReport1.getTaxPoint());
+                                    //未付
+                                    tranSettlementReport1.setAmountNotPayable(Float.valueOf(String.valueOf(tranSettlementReport1.getTotalPayable())));
                                 }
                                 tranSettlementReportService.updateById(tranSettlementReport1);
                                 }
@@ -549,7 +551,7 @@ public class TranProcessInfoServiceImpl extends ServiceImpl<TranProcessInfoMappe
                             //合计应付
                             tranSettlementReport.setTotalPayable(tranSettlementReport.getAmountActuallyPaid()+tranSettlementReport.getTaxPoint());
                             //未付
-                            tranSettlementReport.setAmountNotPayable(tranSettlementReport.getAmountIngPayable());
+                            tranSettlementReport.setAmountNotPayable(Float.valueOf(String.valueOf(tranSettlementReport.getTotalPayable())));
                             tranSettlementReport.setBatchId(batchReviewInfo.getId());
                             tranSettlementReportService.insert(tranSettlementReport);
                             flagBatch="1";

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

@@ -272,8 +272,8 @@ public class TranSettlementReportServiceImpl extends ServiceImpl<TranSettlementR
             //1 修改扣款
             else if (tranSettlementReport.getFlag() == 1) {
                 tranSettlementReport1.setDeductionAmount(tranSettlementReport.getDeductionAmount());
-                tranSettlementReport1.setAmountIngPayable(tranSettlementReport1.getSettlementWeight()*tranSettlementReport1.getTransportPrice()-Float.valueOf(tranSettlementReport1.getDeductionAmount()));
-                tranSettlementReport1.setAmountNotPayable(tranSettlementReport1.getAmountIngPayable()-tranSettlementReport1.getAmountEdPayable());
+//                tranSettlementReport1.setAmountIngPayable(tranSettlementReport1.getSettlementWeight()*tranSettlementReport1.getTransportPrice()-Float.valueOf(tranSettlementReport1.getDeductionAmount()));
+//                tranSettlementReport1.setAmountNotPayable(tranSettlementReport1.getAmountIngPayable()-tranSettlementReport1.getAmountEdPayable());
                 //实付金额
                 tranSettlementReport1.setAmountActuallyPaid(Double.valueOf(tranSettlementReport1.getTransportPrice()) * tranSettlementReport1.getSettlementWeight()
                         - Double.valueOf(tranSettlementReport1.getDeductionAmount() != null ? tranSettlementReport1.getDeductionAmount() : "0") - tranSettlementReport1.getServiceCharge());
@@ -328,8 +328,8 @@ public class TranSettlementReportServiceImpl extends ServiceImpl<TranSettlementR
             //6 修改结算单价
             else if (tranSettlementReport.getFlag() == 6) {
                 tranSettlementReport1.setSettlementPrice(tranSettlementReport.getSettlementPrice());
-                tranSettlementReport1.setAmountIngPayable(tranSettlementReport1.getSettlementWeight()*Float.valueOf(String.valueOf(tranSettlementReport1.getSettlementPrice()))-Float.valueOf(tranSettlementReport1.getDeductionAmount()));
-                tranSettlementReport1.setAmountNotPayable(tranSettlementReport1.getAmountIngPayable()-tranSettlementReport1.getAmountEdPayable());
+//                tranSettlementReport1.setAmountIngPayable(tranSettlementReport1.getSettlementWeight()*Float.valueOf(String.valueOf(tranSettlementReport1.getSettlementPrice()))-Float.valueOf(tranSettlementReport1.getDeductionAmount()));
+//                tranSettlementReport1.setAmountNotPayable(tranSettlementReport1.getAmountIngPayable()-tranSettlementReport1.getAmountEdPayable());
                 //实付金额
                 tranSettlementReport1.setAmountActuallyPaid(tranSettlementReport1.getSettlementPrice() * tranSettlementReport1.getSettlementWeight()
                         - Double.valueOf(tranSettlementReport1.getDeductionAmount() != null ? tranSettlementReport1.getDeductionAmount() : "0") - tranSettlementReport1.getServiceCharge());

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

@@ -994,6 +994,8 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                     tranSettlementReport.setTaxPoint(tranSettlementReport.getAmountActuallyPaid()/0.946*0.054);
                                     //合计应付
                                     tranSettlementReport.setTotalPayable(tranSettlementReport.getAmountActuallyPaid()+tranSettlementReport.getTaxPoint());
+                                    //未付
+                                    tranSettlementReport.setAmountNotPayable(Float.valueOf(String.valueOf(tranSettlementReport.getTotalPayable())));
                                 }
                             }
                             tranSettlementReportService.updateById(tranSettlementReport);
@@ -1503,8 +1505,6 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                         tranSettlementReport.setServiceCharge(20d);
                                         //运输单价不为空
                                         if (tranProcessInfo.getTranPrice()!=null){
-                                            //应付
-                                            tranSettlementReport.setAmountIngPayable(Float.valueOf(tranProcessInfo.getTranPrice()) * tranSettlementReport.getSettlementWeight());
                                             //实付金额
                                             if(tranSettlementReport.getDeductionAmount() != null){
                                                 tranSettlementReport.setAmountActuallyPaid(Double.valueOf(tranProcessInfo.getTranPrice()) * tranSettlementReport.getSettlementWeight()
@@ -1518,7 +1518,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                             //合计应付
                                             tranSettlementReport.setTotalPayable(tranSettlementReport.getAmountActuallyPaid()+tranSettlementReport.getTaxPoint());
                                             //未付
-                                            tranSettlementReport.setAmountNotPayable(Float.valueOf(tranProcessInfo.getTranPrice()) * tranSettlementReport.getSettlementWeight());
+                                            tranSettlementReport.setAmountNotPayable(Float.valueOf(String.valueOf(tranSettlementReport.getTotalPayable())));
                                             tranSettlementReport.setTransportPrice(tranProcessInfo.getTranPrice());
                                             tranSettlementReport.setSettlementPrice(Double.valueOf(String.valueOf(tranProcessInfo.getTranPrice())));
                                         }
@@ -1712,10 +1712,8 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                     tranSettlementReport.setTaxPoint(tranSettlementReport.getAmountActuallyPaid()/0.946*0.054);
                                     //合计应付
                                     tranSettlementReport.setTotalPayable(tranSettlementReport.getAmountActuallyPaid()+tranSettlementReport.getTaxPoint());
-                                    //应付
-                                    tranSettlementReport.setAmountIngPayable(Float.valueOf(tranCarInfo.getTranPrice()) * tranSettlementReport.getSettlementWeight());
                                     //未付
-                                    tranSettlementReport.setAmountNotPayable(Float.valueOf(tranCarInfo.getTranPrice()) * tranSettlementReport.getSettlementWeight());
+                                    tranSettlementReport.setAmountNotPayable(Float.valueOf(String.valueOf(tranSettlementReport.getTotalPayable())));
                                     tranSettlementReport.setTransportPrice(Float.valueOf(tranCarInfo.getTranPrice()));
                                     tranSettlementReport.setSettlementPrice(Double.valueOf(tranCarInfo.getTranPrice()));
                                 }
@@ -2255,10 +2253,8 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                 tranSettlementReport.setTaxPoint(tranSettlementReport.getAmountActuallyPaid()/0.946*0.054);
                                 //合计应付
                                 tranSettlementReport.setTotalPayable(tranSettlementReport.getAmountActuallyPaid()+tranSettlementReport.getTaxPoint());
-                                //应付
-                                tranSettlementReport.setAmountIngPayable(Float.valueOf(tranCarInfo.getTranPrice()) * tranSettlementReport.getSettlementWeight());
                                 //未付
-                                tranSettlementReport.setAmountNotPayable(Float.valueOf(tranCarInfo.getTranPrice()) * tranSettlementReport.getSettlementWeight());
+                                tranSettlementReport.setAmountNotPayable(Float.valueOf(String.valueOf(tranSettlementReport.getTotalPayable())));
                                 tranSettlementReport.setTransportPrice(Float.valueOf(tranCarInfo.getTranPrice()));
                                 tranSettlementReport.setSettlementPrice(Double.valueOf(tranCarInfo.getTranPrice()));
                             }
@@ -3809,6 +3805,8 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                         tranSettlementReport.setTaxPoint(tranSettlementReport.getAmountActuallyPaid()/0.946*0.054);
                                         //合计应付
                                         tranSettlementReport.setTotalPayable(tranSettlementReport.getAmountActuallyPaid()+tranSettlementReport.getTaxPoint());
+                                        //未付
+                                        tranSettlementReport.setAmountNotPayable(Float.valueOf(String.valueOf(tranSettlementReport.getTotalPayable())));
                                     }
                                 }
                             }
@@ -4444,10 +4442,8 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                             tranSettlementReport.setTaxPoint(tranSettlementReport.getAmountActuallyPaid()/0.946*0.054);
                                             //合计应付
                                             tranSettlementReport.setTotalPayable(tranSettlementReport.getAmountActuallyPaid()+tranSettlementReport.getTaxPoint());
-                                            //应付
-                                            tranSettlementReport.setAmountIngPayable(tranProcessInfo.getTranPrice() * tranSettlementReport.getSettlementWeight());
                                             //未付
-                                            tranSettlementReport.setAmountNotPayable(tranProcessInfo.getTranPrice() * tranSettlementReport.getSettlementWeight());
+                                            tranSettlementReport.setAmountNotPayable(Float.valueOf(String.valueOf(tranSettlementReport.getTotalPayable())));
                                             tranSettlementReport.setTransportPrice(tranProcessInfo.getTranPrice());
                                             tranSettlementReport.setSettlementPrice(Double.valueOf(String.valueOf(tranProcessInfo.getTranPrice())));
                                         }
@@ -4664,10 +4660,8 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                     tranSettlementReport.setTaxPoint(tranSettlementReport.getAmountActuallyPaid()/0.946*0.054);
                                     //合计应付
                                     tranSettlementReport.setTotalPayable(tranSettlementReport.getAmountActuallyPaid()+tranSettlementReport.getTaxPoint());
-                                    //应付
-                                    tranSettlementReport.setAmountIngPayable(Float.valueOf(tranCarInfo.getTranPrice()) * tranSettlementReport.getSettlementWeight());
                                     //未付
-                                    tranSettlementReport.setAmountNotPayable(Float.valueOf(tranCarInfo.getTranPrice()) * tranSettlementReport.getSettlementWeight());
+                                    tranSettlementReport.setAmountNotPayable(Float.valueOf(String.valueOf(tranSettlementReport.getTotalPayable())));
                                     tranSettlementReport.setTransportPrice(Float.valueOf(tranCarInfo.getTranPrice()));
                                     tranSettlementReport.setSettlementPrice(Double.valueOf(tranCarInfo.getTranPrice()));
                                 }
@@ -5286,10 +5280,8 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                 tranSettlementReport.setTaxPoint(tranSettlementReport.getAmountActuallyPaid()/0.946*0.054);
                                 //合计应付
                                 tranSettlementReport.setTotalPayable(tranSettlementReport.getAmountActuallyPaid()+tranSettlementReport.getTaxPoint());
-                                //应付
-                                tranSettlementReport.setAmountIngPayable(Float.valueOf(tranCarInfo.getTranPrice()) * tranSettlementReport.getSettlementWeight());
                                 //未付
-                                tranSettlementReport.setAmountNotPayable(Float.valueOf(tranCarInfo.getTranPrice()) * tranSettlementReport.getSettlementWeight());
+                                tranSettlementReport.setAmountNotPayable(Float.valueOf(String.valueOf(tranSettlementReport.getTotalPayable())));
                                 tranSettlementReport.setTransportPrice(Float.valueOf(tranCarInfo.getTranPrice()));
                                 tranSettlementReport.setSettlementPrice(Double.valueOf(tranCarInfo.getTranPrice()));
                             }

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

@@ -64,6 +64,7 @@
         w.workflow_id as workflowId,
         w.amount_not_payable as amountNotPayable,
         w.contract_no as contractNo,
+        w.weighted_moisture as weightedMoisture,
         w.goods_name as goodsName,
         w.car_no as carNo,
         w.request_funds as requestFunds,