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 update(@RequestBody JSONObject whereJson) { + shutframeinvBcpService.update(whereJson); + return new ResponseEntity<>(HttpStatus.OK); + } + + @PostMapping("/delete") + @Log("删除入库单") + @ApiOperation("删除入库单") + public ResponseEntity 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().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 { 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 }) }