From a160d1cd5d114eb00fa25728fd853347f39d3f75 Mon Sep 17 00:00:00 2001 From: "ZHOUZ\\Noble'lift" <1014987728@qq.com> Date: Thu, 1 Jun 2023 11:28:45 +0800 Subject: [PATCH] =?UTF-8?q?rev:=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 | 8 +++++ .../IStIvtShutframeinvBcpService.java | 2 ++ .../impl/StIvtShutframedtlBcpServiceImpl.java | 8 ++--- .../impl/StIvtShutframeinvBcpServiceImpl.java | 28 +++++++++++++-- .../structIvt/dao/StIvtStructivtBcp.java | 3 ++ .../semiproductShutFrame/index.vue | 16 +++++++++ .../semiproductShutFrame/shutframe.js | 36 ++++++++++++++++--- 7 files changed, 89 insertions(+), 12 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 23cd1822..be449d5a 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 @@ -65,5 +65,13 @@ public class StIvtShutframeinvBcpController { public ResponseEntity getBillDtl(@RequestBody JSONObject jo) { return new ResponseEntity<>(shutframeinvBcpService.getBillDtl(jo), HttpStatus.OK); } + + @PostMapping("/confirm") + @Log("拼盘确认") + @ApiOperation("拼盘确认") + public ResponseEntity confirm(@RequestBody JSONObject jo) { + shutframeinvBcpService.confirm(jo); + return new ResponseEntity<>(HttpStatus.OK); + } } 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 f331294c..2cbfe111 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 @@ -34,5 +34,7 @@ public interface IStIvtShutframeinvBcpService extends IService getBillDtl(JSONObject jo); + void confirm(JSONObject jo); + } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/shutFrame/impl/StIvtShutframedtlBcpServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/shutFrame/impl/StIvtShutframedtlBcpServiceImpl.java index 465e2631..c3fbefba 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/shutFrame/impl/StIvtShutframedtlBcpServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/shutFrame/impl/StIvtShutframedtlBcpServiceImpl.java @@ -34,15 +34,13 @@ import java.util.LinkedList; @Service public class StIvtShutframedtlBcpServiceImpl extends ServiceImpl implements IStIvtShutframedtlBcpService { - private StIvtStructattr first_struct; - - private StIvtStructattr last_struct; - @Autowired private IStIvtStructattrService structattrService; @Override public int create(JSONArray rows, String shutframeinv_id) { + StIvtStructattr first_struct = null; + StIvtStructattr last_struct = null; int total_qty = 1; if (rows.size() > 0 && StringUtils.isNotEmpty(shutframeinv_id)) { @@ -100,6 +98,6 @@ public class StIvtShutframedtlBcpServiceImpl extends ServiceImpl list = shutframedtlBcpService.list(new QueryWrapper().eq("shutframeinv_id", form.getString("shutframeinv_id"))); + list.forEach(dtl -> { + String material_id = dtl.getMaterial_id(); + String turnin_struct_id = dtl.getTurnin_struct_id(); + String turnout_struct_id = dtl.getTurnout_struct_id(); + StIvtStructivtBcp in_ivt = structivtBcpService.getOne(new QueryWrapper().eq("struct_id", turnin_struct_id).eq("material_id", material_id)); + if (ObjectUtil.isEmpty(in_ivt)) { + throw new BadRequestException("库存不能为空！"); + } + in_ivt.setCanuse_qty(NumberUtil.add(in_ivt.getCanuse_qty(), dtl.getFact_qty())); + structivtBcpService.remove(new QueryWrapper().eq("struct_id", turnout_struct_id)); + structivtBcpService.updateById(in_ivt); + }); + } + @Override public List getBillDtl(JSONObject jo) { List list = shutframedtlBcpService.list(new QueryWrapper().eq("shutframeinv_id", jo.getString("shutframeinv_id"))); - List ivt_list = bcpMapper.getStructIvtInfo(MapOf.of("struct_code", list.get(0).getTurnout_struct_code())); - List ivt_list2 = bcpMapper.getStructIvtInfo(MapOf.of("struct_code", list.get(0).getTurnin_struct_code())); + List ivt_list = bcpMapper.getStructIvtInfo(MapOf.of("struct_code", list.get(0).getTurnin_struct_code())); + List ivt_list2 = bcpMapper.getStructIvtInfo(MapOf.of("struct_code", list.get(0).getTurnout_struct_code())); ivt_list.addAll(ivt_list2); return ivt_list; } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/dao/StIvtStructivtBcp.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/dao/StIvtStructivtBcp.java index 088eb0dd..0fdd5108 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/dao/StIvtStructivtBcp.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/dao/StIvtStructivtBcp.java @@ -1,6 +1,8 @@ package org.nl.wms.storage_manage.semimanage.service.structIvt.dao; import java.math.BigDecimal; + +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import java.util.Date; import java.io.Serializable; @@ -28,6 +30,7 @@ public class StIvtStructivtBcp implements Serializable { /** * 仓位标识 */ + @TableId private String struct_id; /** diff --git a/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductShutFrame/index.vue b/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductShutFrame/index.vue index d76d2800..bfbbd522 100644 --- a/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductShutFrame/index.vue +++ b/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductShutFrame/index.vue @@ -128,6 +128,17 @@ > 任务下发 + + 强制确认 + { + this.querytable() + }) + }, checkboxT(row) { return row.bill_status !== '99' }, 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 d14a17c4..e9d3db9e 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 @@ -10,8 +10,8 @@ export function add(data) { export function del(ids) { return request({ - url: 'api/shutframe/', - method: 'delete', + url: 'api/shutframe/delete', + method: 'post', data: ids }) } @@ -31,6 +31,7 @@ export function getOutBillDtl(data) { data }) } + export function getOutBillDtl2(params) { return request({ url: '/api/shutframe/getOutBillDtl2', @@ -38,12 +39,14 @@ export function getOutBillDtl2(params) { params }) } + export function getInvTypes() { return request({ url: '/api/shutframe/getInvTypes', method: 'get' }) } + export function insertDtl(data) { return request({ url: '/api/shutframe/insertDtl', @@ -51,6 +54,7 @@ export function insertDtl(data) { data }) } + export function getBcpIvtInfo(data) { return request({ url: '/api/bcp/getBcpIvtInfo', @@ -58,6 +62,7 @@ export function getBcpIvtInfo(data) { data }) } + export function getStructIvt2(params) { return request({ url: '/api/shutframe/getStructIvt2', @@ -65,6 +70,7 @@ export function getStructIvt2(params) { params }) } + export function getStruct(params) { return request({ url: '/api/shutframe/getStruct', @@ -72,13 +78,15 @@ export function getStruct(params) { params }) } -export function handdown(data) { + +export function confirm(data) { return request({ - url: '/api/shutframe/handdown', + url: '/api/shutframe/confirm', method: 'post', data }) } + export function getOutBillTask(params) { return request({ url: '/api/shutframe/getOutBillTask', @@ -86,6 +94,7 @@ export function getOutBillTask(params) { params }) } + export function issueTask(data) { return request({ url: '/api/shutframe/issueTask', @@ -93,6 +102,7 @@ export function issueTask(data) { data }) } + export function finishTask(data) { return request({ url: '/api/shutframe/finishTask', @@ -100,6 +110,7 @@ export function finishTask(data) { data }) } + export function allCancel(data) { return request({ url: '/api/shutframe/allCancel', @@ -107,4 +118,19 @@ export function allCancel(data) { data }) } -export default { add, edit, del, getOutBillDtl, allCancel, getBcpIvtInfo, getOutBillTask, finishTask, issueTask, getInvTypes, handdown, getOutBillDtl2, getStructIvt2, getStruct } + +export default { + add, + edit, + del, + getOutBillDtl, + allCancel, + getBcpIvtInfo, + getOutBillTask, + finishTask, + confirm, + getInvTypes, + getOutBillDtl2, + getStructIvt2, + getStruct +}