Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun

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

@@ -45,5 +45,20 @@ public class StockPurchaseReceiptReportController {
     public  String disAndRemark(ContractManagementInfo contractManagementInfo){
         return stockPurchaseReceiptReportService.disAndRemark(contractManagementInfo);
     }
+
+
+
+    /**
+     * 修改结算重量
+     *
+     * @param stockPurchaseReceiptReport
+     * @return
+     */
+    @PostMapping("/api/edit")
+    public  String edit(StockPurchaseReceiptReport stockPurchaseReceiptReport){
+        return stockPurchaseReceiptReportService.edit(stockPurchaseReceiptReport);
+    }
+
+
 }
 

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

@@ -31,4 +31,13 @@ public interface IStockPurchaseReceiptReportService extends IService<StockPurcha
      */
     String disAndRemark(ContractManagementInfo contractManagementInfo);
 
+
+    /**
+     * 修改结算重量
+     *
+     * @param stockPurchaseReceiptReport
+     * @return
+     */
+    String edit(StockPurchaseReceiptReport stockPurchaseReceiptReport);
+
 }

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

@@ -133,6 +133,27 @@ public class StockPurchaseReceiptReportServiceImpl extends ServiceImpl<StockPurc
     }
 
 
+    /**
+     * 修改结算重量
+     *
+     * @param stockPurchaseReceiptReport
+     * @return
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public String edit(StockPurchaseReceiptReport stockPurchaseReceiptReport) {
+        //查询采购入库报表
+        StockPurchaseReceiptReport stockPurchaseReceiptReport1 = this.selectById(stockPurchaseReceiptReport.getId());
+        if (stockPurchaseReceiptReport1 != null) {
+            stockPurchaseReceiptReport1.setSettlementWeight(stockPurchaseReceiptReport.getSettlementWeight());
+            //更改采购入库报表信息
+            this.updateById(stockPurchaseReceiptReport1);
+            return "OK";
+        }
+        return "NG";
+    }
+
+
     private List<String> getResourceIdList() {
         User currentUser = AuthSecurityUtils.getCurrentUserInfo();
         // 当前登录人主要角色