From 0b0eea4eae96797faf297b5c2f1b7b6c41d4dd2a Mon Sep 17 00:00:00 2001
From: ptt <2403326863@qq.com>
Date: Mon, 7 Jul 2025 15:28:02 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A3=85=E5=8D=95=E4=BF=A1=E6=81=AF=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=89=93=E5=9B=9E=E5=A4=8D=E7=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bill/controller/PoundBillController.java  |  9 ++++++
 .../ruoyi/bill/service/IPoundBillService.java |  2 ++
 .../service/impl/PoundBillServiceImpl.java    | 19 +++++++++++++
 .../src/api/measurement/bill/poundbill.js     |  9 ++++++
 .../measurement/bill/poundbill/index.vue      | 28 ++++++++++++++++++-
 5 files changed, 66 insertions(+), 1 deletion(-)

diff --git a/measurement/src/main/java/com/ruoyi/bill/controller/PoundBillController.java b/measurement/src/main/java/com/ruoyi/bill/controller/PoundBillController.java
index 2aad150..b55e264 100644
--- a/measurement/src/main/java/com/ruoyi/bill/controller/PoundBillController.java
+++ b/measurement/src/main/java/com/ruoyi/bill/controller/PoundBillController.java
@@ -185,6 +185,15 @@ public class PoundBillController extends BaseController
         return toAjax(poundBillService.removeByIds(Arrays.asList(ids)));
     }
 
+    /**
+     * 打回复磅
+     */
+	@GetMapping("/returnPound/{ids}")
+    public AjaxResult returnPound(@PathVariable String[] ids)
+    {
+        return toAjax(poundBillService.returnPound(ids[0]));
+    }
+
 
     /**
      * 根据主榜单获取最新捆号
diff --git a/measurement/src/main/java/com/ruoyi/bill/service/IPoundBillService.java b/measurement/src/main/java/com/ruoyi/bill/service/IPoundBillService.java
index 8578982..5772207 100644
--- a/measurement/src/main/java/com/ruoyi/bill/service/IPoundBillService.java
+++ b/measurement/src/main/java/com/ruoyi/bill/service/IPoundBillService.java
@@ -75,4 +75,6 @@ public interface IPoundBillService extends IService<PoundBill>
     public int deletePoundBillById(String id);
 
     public String getMaxBundleNoByMst(String mstId);
+
+    public boolean returnPound(String id);
 }
diff --git a/measurement/src/main/java/com/ruoyi/bill/service/impl/PoundBillServiceImpl.java b/measurement/src/main/java/com/ruoyi/bill/service/impl/PoundBillServiceImpl.java
index 0ed39cb..a1845cd 100644
--- a/measurement/src/main/java/com/ruoyi/bill/service/impl/PoundBillServiceImpl.java
+++ b/measurement/src/main/java/com/ruoyi/bill/service/impl/PoundBillServiceImpl.java
@@ -14,6 +14,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.basedata.domain.Empwgtdata;
 import com.ruoyi.basedata.service.impl.EmpwgtdataServiceImpl;
 import com.ruoyi.bill.domain.Poundappli;
+import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.system.service.ISysConfigService;
@@ -462,4 +463,22 @@ public class PoundBillServiceImpl extends ServiceImpl<PoundBillMapper, PoundBill
     public String getMaxBundleNoByMst(String mstId) {
         return poundBillMapper.getMaxBundleNoByMst(mstId);
     }
+
+    public boolean returnPound(String id){
+        //接口
+
+        //接口通了之后走这个逻辑
+        PoundBill poundBill = selectPoundBillById(id);
+        poundBill.setAgngrossmqty(poundBill.getWghmqty());
+        poundBill.setAgntaremqty(poundBill.getEmpmqty());
+        poundBill.setAgnnetmqty(poundBill.getNetmqty());
+
+        poundBill.setAgnstatus("ing");
+        poundBill.setBillstate("1");
+        poundBill.setWghmqty(BigDecimal.ZERO);
+        poundBill.setEmpmqty(BigDecimal.ZERO);
+        poundBill.setNetmqty(BigDecimal.ZERO);
+        updateById(poundBill);
+        return true;
+    }
 }
diff --git a/ruoyi-ui/src/api/measurement/bill/poundbill.js b/ruoyi-ui/src/api/measurement/bill/poundbill.js
index 4d15fa0..76a7658 100644
--- a/ruoyi-ui/src/api/measurement/bill/poundbill.js
+++ b/ruoyi-ui/src/api/measurement/bill/poundbill.js
@@ -111,3 +111,12 @@ export function delPoundbill(id) {
     method: 'delete'
   })
 }
+
+
+// 打回复磅
+export function returnPound(id) {
+  return request({
+    url: '/measurement/poundbill/returnPound/'+id,
+    method: 'get'
+  })
+}
diff --git a/ruoyi-ui/src/views/measurement/bill/poundbill/index.vue b/ruoyi-ui/src/views/measurement/bill/poundbill/index.vue
index 6c004c1..df13935 100644
--- a/ruoyi-ui/src/views/measurement/bill/poundbill/index.vue
+++ b/ruoyi-ui/src/views/measurement/bill/poundbill/index.vue
@@ -198,6 +198,14 @@
           v-hasPermi="['measurement:poundbill:export']"
         >导出</el-button>
       </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          size="mini"
+          @click="handleReturnPound"
+        >打回复磅</el-button>
+      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -616,7 +624,7 @@
 </template>
 
 <script>
-import { listPoundbill,getNumber, getPoundbill, delPoundbill, addPoundbill, updatePoundbill } from "@/api/measurement/bill/poundbill"
+import { listPoundbill,getNumber, getPoundbill, delPoundbill, addPoundbill, updatePoundbill, returnPound } from "@/api/measurement/bill/poundbill"
 
 export default {
   name: "Poundbill",
@@ -627,6 +635,8 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
+      // 选中数组
+      billstates: [],
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -806,6 +816,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
+      this.billstates = selection.map(item => item.billstate)
       this.single = selection.length!==1
       this.multiple = !selection.length
     },
@@ -864,6 +875,21 @@ export default {
         ...this.queryParams
       }, `poundbill_${new Date().getTime()}.xlsx`)
     },
+    /** 打回复磅按钮操作 */
+    handleReturnPound() {
+      let billstates = this.billstates;
+      let ids = this.ids;
+      if(ids.length!=1){
+        this.$modal.msgWarning("请选择一条数据!")
+      }else if(billstates[0] == "2"){
+        returnPound(ids).then(response => {
+          this.$modal.msgSuccess("打回成功")
+          this.getList()
+        })
+      }else{
+        this.$modal.msgWarning("只能打回已完成的状态!")
+      }
+    },
 
     //点击选中。
     handleRowClick(row) {