修改

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

@@ -55,7 +55,7 @@ public class PurchasePriceController {
      * @return
      */
     @PostMapping("/purchasePriceEdit")
-    public String purchasePriceEdit(PurchasePrice purchasePrice) {
+    public String purchasePriceEdit(@RequestBody PurchasePrice purchasePrice) {
         return iPurchasePriceService.purchasePriceEdit(purchasePrice);
     }
     /**
@@ -64,7 +64,7 @@ public class PurchasePriceController {
      * @return
      */
     @PostMapping("/purchasePriceDel")
-    public String purchasePriceDel(PurchasePrice purchasePrice) {
+    public String purchasePriceDel(@RequestBody PurchasePrice purchasePrice) {
         return iPurchasePriceService.purchasePriceDel(purchasePrice);
     }
     /**
@@ -73,7 +73,7 @@ public class PurchasePriceController {
      * @return
      */
     @PostMapping("/purchasePriceAllowEdit")
-    public String purchasePriceAllowEdit(PurchasePrice purchasePrice) {
+    public String purchasePriceAllowEdit(@RequestBody PurchasePrice purchasePrice) {
         return iPurchasePriceService.purchasePriceAllowEdit(purchasePrice);
     }
     /**

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

@@ -47,6 +47,14 @@ public class PaymentManagement extends BaseModel<PaymentManagement> {
      * 公司id
      */
     private String compId;
+    /**
+     * 类型
+     */
+    private String type;
+    /**
+     * 质量扣款
+     */
+    private Float qualityDeduction;
     /**
      * 编号
      */

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

@@ -62,6 +62,10 @@ public class PurchasePrice extends BaseModel<PurchasePrice> {
      * 货名
      */
     private String goodsName;
+    /**
+     * 干粮收购价
+     */
+    private Float dryGrainPrice;
     /**
      * 基准水分（%）
      */
@@ -120,6 +124,7 @@ public class PurchasePrice extends BaseModel<PurchasePrice> {
      */
     @TableField(exist = false)
     private String grade;
+
     @Override
     protected Serializable pkVal() {
         return this.id;

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

@@ -44,6 +44,14 @@ public class QualityInspectionManagement extends BaseModel<QualityInspectionMana
      * 关联id
      */
     private String relationId;
+    /**
+     * 类型
+     */
+    private String type;
+    /**
+     * 购粮性质
+     */
+    private String natureOfGrainPurchase;
     /**
      * 质检编号
      */

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

@@ -44,6 +44,10 @@ public class WeighingManagement extends BaseModel<WeighingManagement> {
      * 关联id
      */
     private String relationId;
+    /**
+     * 类型
+     */
+    private String type;
     /**
      * 编号
      */

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

@@ -61,7 +61,6 @@ public class PurchasePriceServiceImpl extends ServiceImpl<PurchasePriceMapper, P
 
         if (!CollectionUtils.isEmpty(dataList)) {
             dataList.forEach(purchasePrice1 -> {
-
                 String taskId = "";
                 // 只有待审核状态才有taskId
                 if (StringUtils.isNotBlank(purchasePrice1.getWorkflowId())) {
@@ -214,9 +213,9 @@ public class PurchasePriceServiceImpl extends ServiceImpl<PurchasePriceMapper, P
 
     @Override
     public String purchasePriceAllowEdit(PurchasePrice purchasePrice) {
-        WarehouseBaseInfo warehouseBaseInfo = this.warehouseBaseInfoService.selectById(purchasePrice.getWarehouseId());
+        WarehouseBaseInfo warehouseBaseInfo = warehouseBaseInfoService.selectById(purchasePrice.getWarehouseId());
         warehouseBaseInfo.setAllowEdit("1");
-        this.warehouseBaseInfoService.updateById(warehouseBaseInfo);
+        warehouseBaseInfoService.updateById(warehouseBaseInfo);
         return "ok";
     }
 

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

@@ -163,6 +163,7 @@ public class QualityInspectionManagementServiceImpl extends ServiceImpl<QualityI
         weighingManagement.setCompId(qualityInspectionManagement.getCompId());
         weighingManagement.setGoodsName(qualityInspectionManagement.getGoodsName());
         weighingManagement.setBinNumber(qualityInspectionManagement.getBinNumber());
+        weighingManagement.setType(qualityInspectionManagement.getType());
         weighingManagement.setWarehouseName(qualityInspectionManagement.getWarehouseName());
         //状态为已质检
         weighingManagement.setStatus(StatusEnum.INSPECTED.getName());

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

@@ -132,7 +132,7 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
         weighingManagement.setStatusFlag(StatusEnum.TARED.getFlag());
         //质检信息
         QualityInspectionManagement qualityInspectionManagement1 = qualityInspectionManagementService.selectOne(new EntityWrapper<QualityInspectionManagement>()
-                .eq("relation_id", weighingManagement.getRelationId()));
+                .eq("relation_id", weighingManagement1.getRelationId()));
         if (qualityInspectionManagement1!=null){
             //状态改为已称皮重
             qualityInspectionManagement1.setStatus(StatusEnum.TARED.getName());
@@ -155,6 +155,7 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
             paymentManagement1.setPaymentNo(weighingManagement1.getNumber());
             paymentManagement1.setCustomerName(weighingManagement1.getCustomer());
             paymentManagement1.setCarNo(weighingManagement1.getCarNumber());
+            paymentManagement1.setType(weighingManagement1.getType());
             paymentManagement1.setGoodsName(weighingManagement1.getGoodsName());
             paymentManagement1.setNetWeight(weighingManagement1.getNetWeight());
             paymentManagement1.setWarehouseName(weighingManagement1.getWarehouseName());

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

@@ -8,6 +8,7 @@
         wbi.warehouse_name AS warehouseName,
         pp.id,
         pp.goods_name AS goodsName,
+        pp.warehouse_id as warehouseId,
         pp.water_min AS waterMin,
         pp.water_max AS waterMax,
         pp.water_base AS waterBase,

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

@@ -26,6 +26,7 @@
         customer,
         contract_no as contractNo,
         car_number as carNumber,
+        relation_id as relationId,
         goods_name as goodsName,
         gross_weight as grossWeight,
         tare,