From d7c940005368685c9814ccd3fd2e5829097b7481 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期六, 13 三月 2021 16:23:21 +0800 Subject: [PATCH] # --- src/main/webapp/static/js/custOrder/custOrder.js | 2 +- src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java | 39 ++++++++++++++++++++++++--------------- 2 files changed, 25 insertions(+), 16 deletions(-) diff --git a/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java b/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java index 218a5f1..8faa579 100644 --- a/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java +++ b/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java @@ -64,22 +64,31 @@ if (!update) { throw new CoolException("淇敼鎵樼洏璧勬枡妗eけ璐�"); } - // 鏇存柊璐т綅搴撳瓨鏄庣粏 - LocDetl locDetl = new LocDetl(); - locDetl.setLocNo(node.getName()); - locDetl.setNodeId(node.getId()); - locDetl.setZpallet(param.getZpallet()); - locDetl.setAnfme(comb.getAnfme()); - VersionUtils.setLocDetl(locDetl, comb); - locDetl.setStatus(1); - locDetl.setCreateBy(userId); - locDetl.setCreateTime(now); - locDetl.setUpdateBy(userId); - locDetl.setUpdateTime(now); - boolean insert = locDetlService.insert(locDetl); - if (!insert) { - throw new CoolException("鏂板搴撳瓨鏄庣粏妗eけ璐�"); + LocDetl locDetl = locDetlService.getLocDetl(node.getId(), comb.getMatnr()); + if (locDetl == null) { + // 鏇存柊璐т綅搴撳瓨鏄庣粏 + locDetl = new LocDetl(); + locDetl.setLocNo(node.getName()); + locDetl.setNodeId(node.getId()); + locDetl.setZpallet(param.getZpallet()); + locDetl.setAnfme(comb.getAnfme()); + VersionUtils.setLocDetl(locDetl, comb); + locDetl.setStatus(1); + locDetl.setCreateBy(userId); + locDetl.setCreateTime(now); + locDetl.setUpdateBy(userId); + locDetl.setUpdateTime(now); + boolean insert = locDetlService.insert(locDetl); + if (!insert) { + throw new CoolException("鏂板搴撳瓨鏄庣粏妗eけ璐�"); + } + } else { + if (!locDetlService.incrementStock(node.getId(), comb.getMatnr(), comb.getAnfme())) { + throw new CoolException("鏂板搴撳瓨鏄庣粏妗eけ璐�"); + } + } + } return R.ok(); } diff --git a/src/main/webapp/static/js/custOrder/custOrder.js b/src/main/webapp/static/js/custOrder/custOrder.js index 90bcf04..72f793b 100644 --- a/src/main/webapp/static/js/custOrder/custOrder.js +++ b/src/main/webapp/static/js/custOrder/custOrder.js @@ -219,7 +219,7 @@ page: true, cellMinWidth: 100, // ,width: admin.screen() > 1 ? 892 : '' - height: 332, + height: 432, cols: [[ {field: 'title', title: '鍟嗗搧', align: 'center'}, {field: 'anfme', title: '鎬绘暟閲�', align: 'center', style: 'font-weight: bold', width: 80}, -- Gitblit v1.9.1