From 8fc96a773ded1255c274f178d26ed29a848f8675 Mon Sep 17 00:00:00 2001
From: "ZHOUZ\\Noble'lift" <1014987728@qq.com>
Date: Wed, 31 May 2023 19:36:19 +0800
Subject: [PATCH] =?UTF-8?q?dev:=E6=8B=86=E6=8B=BC=E7=9B=98=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../StIvtShutframeinvBcpController.java       | 16 ++++++++++
 .../IStIvtShutframeinvBcpService.java         |  4 +++
 .../impl/StIvtShutframeinvBcpServiceImpl.java | 30 +++++++++++++++++++
 .../semiproductShutFrame/AddDialog.vue        |  1 +
 .../semiproductShutFrame/shutframe.js         |  4 +--
 5 files changed, 53 insertions(+), 2 deletions(-)

diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/shutFrame/StIvtShutframeinvBcpController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/shutFrame/StIvtShutframeinvBcpController.java
index 7b096636..23cd1822 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/shutFrame/StIvtShutframeinvBcpController.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/shutFrame/StIvtShutframeinvBcpController.java
@@ -36,6 +36,22 @@ public class StIvtShutframeinvBcpController {
         return new ResponseEntity<>(HttpStatus.OK);
     }
 
+    @PostMapping("/update")
+    @Log("修改拼盘单")
+    @ApiOperation("修改拼盘单")
+    public ResponseEntity<Object> update(@RequestBody JSONObject whereJson) {
+        shutframeinvBcpService.update(whereJson);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+
+    @PostMapping("/delete")
+    @Log("删除入库单")
+    @ApiOperation("删除入库单")
+    public ResponseEntity<Object> delete(@RequestBody Long[] ids){
+        shutframeinvBcpService.delete(ids);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+
     @GetMapping
     @Log("查询拼盘单")
     @ApiOperation("查询拼盘单")
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/shutFrame/IStIvtShutframeinvBcpService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/shutFrame/IStIvtShutframeinvBcpService.java
index 16187295..f331294c 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/shutFrame/IStIvtShutframeinvBcpService.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/shutFrame/IStIvtShutframeinvBcpService.java
@@ -21,6 +21,10 @@ public interface IStIvtShutframeinvBcpService extends IService<StIvtShutframeinv
 
     void create (JSONObject jo);
 
+    void update(JSONObject map);
+
+    void delete(Long[] ids);
+
     /**
      * 分页查询
      * @param query,page /
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/shutFrame/impl/StIvtShutframeinvBcpServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/shutFrame/impl/StIvtShutframeinvBcpServiceImpl.java
index f6729bd5..790fd12f 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/shutFrame/impl/StIvtShutframeinvBcpServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/shutFrame/impl/StIvtShutframeinvBcpServiceImpl.java
@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
+import io.jsonwebtoken.lang.Assert;
 import org.jetbrains.annotations.NotNull;
 import org.nl.common.TableDataInfo;
 import org.nl.common.domain.query.PageQuery;
@@ -21,6 +22,7 @@ import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtBsrealstorattr
 import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtBsrealstorattr;
 import org.nl.wms.storage_manage.IOSEnum;
 import org.nl.wms.storage_manage.SHUTEnum;
+import org.nl.wms.storage_manage.rawmanage.service.iostorInv.dao.StIvtIostorinvYl;
 import org.nl.wms.storage_manage.semimanage.service.shutFrame.IStIvtShutframedtlBcpService;
 import org.nl.wms.storage_manage.semimanage.service.shutFrame.IStIvtShutframeinvBcpService;
 import org.nl.wms.storage_manage.semimanage.service.shutFrame.dao.StIvtShutframedtlBcp;
@@ -71,6 +73,33 @@ public class StIvtShutframeinvBcpServiceImpl extends ServiceImpl<StIvtShutframei
         return ivt_list;
     }
 
+    @Override
+    public void delete(Long[] ids) {
+        for (Long id : ids) {
+            StIvtShutframeinvBcp dao = this.getOne(new QueryWrapper<StIvtShutframeinvBcp>().eq("shutframeinv_id", id));
+            dao.setIs_delete(true);
+
+            this.updateById(dao);
+        }
+    }
+
+    @Override
+    public void update(JSONObject form) {
+        Assert.notNull(new Object[]{form, form.get("shutframeinv_id")}, "请求参数不能为空");
+        StIvtShutframeinvBcp mst = form.toJavaObject(StIvtShutframeinvBcp.class);
+        mst.setUpdate_optid(SecurityUtils.getCurrentUserId());
+        mst.setUpdate_optname(SecurityUtils.getCurrentNickName());
+        mst.setUpdate_time(DateUtil.now());
+
+
+        JSONArray rows = form.getJSONArray("tableData");
+        if (ObjectUtil.isEmpty(rows)) throw new BadRequestException("请求参数不能为空");
+        // 调用明细表 插入/更新方法
+        int i = shutframedtlBcpService.create(rows, mst.getShutframeinv_id());
+        mst.setDetail_count(BigDecimal.valueOf(i));
+        this.updateById(mst);
+    }
+
     @Override
     public void create(JSONObject form) {
         JSONArray rows = form.getJSONArray("tableData");
@@ -87,6 +116,7 @@ public class StIvtShutframeinvBcpServiceImpl extends ServiceImpl<StIvtShutframei
         this.save(shutframeinvBcp);
     }
 
+
     @NotNull
     private StIvtShutframeinvBcp packageMstForm(StIvtShutframeinvBcp shutMst, JSONObject whereJson, Boolean isUpdate) {
         if (!isUpdate) {
diff --git a/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductShutFrame/AddDialog.vue b/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductShutFrame/AddDialog.vue
index 7af0c490..47add129 100644
--- a/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductShutFrame/AddDialog.vue
+++ b/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductShutFrame/AddDialog.vue
@@ -289,6 +289,7 @@ export default {
       this.tableData1 = []
       this.form.detail_count = this.form.tableData.length
 
+      this.form.tableData = []
       shutframe.getBcpIvtInfo({ 'material_id': row.material_id, 'stor_id': this.form.stor_id }).then(res => {
         this.tableData1 = res
         this.right_flag = false
diff --git a/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductShutFrame/shutframe.js b/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductShutFrame/shutframe.js
index 9547c165..d14a17c4 100644
--- a/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductShutFrame/shutframe.js
+++ b/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductShutFrame/shutframe.js
@@ -18,8 +18,8 @@ export function del(ids) {
 
 export function edit(data) {
   return request({
-    url: 'api/shutframe',
-    method: 'put',
+    url: 'api/shutframe/update',
+    method: 'post',
     data
   })
 }