From 786b7ba9ac838c1d947de03be3ee98d199ca9dc9 Mon Sep 17 00:00:00 2001 From: LSH Date: 星期五, 02 十二月 2022 17:00:21 +0800 Subject: [PATCH] #修改合同号 --- src/main/webapp/views/report/locDetl_detail.html | 10 ++++++++-- src/main/java/com/zy/asrs/controller/LocDetlController.java | 43 ++++++++++++++++++++++++++++++++++++++++++- src/main/webapp/static/js/locMast/locMast.js | 1 + 3 files changed, 51 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java index 87d2cbb..718a63b 100644 --- a/src/main/java/com/zy/asrs/controller/LocDetlController.java +++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java @@ -161,7 +161,48 @@ @ManagerAuth(memo = "鍚堝悓鍙凤紙鎵瑰彿锛変慨鏀�") public R updateBatch(LocDetl locDetl){ if (Cools.isEmpty(locDetl) || null==locDetl.getMatnr()){ - return R.error(); + return R.error("鍙傛暟寮傚父"); + }else if (locDetl.getBatch().equals(locDetl.getSku())){ + return R.error("鍓嶅悗鍚堝悓鍙蜂竴鑷达紝鏃犻渶淇敼锛侊紒锛�"); + } + try{ + LocDetl locDetlSource = locDetlService.selectItem(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getBatch()); + if (Cools.isEmpty(locDetlSource) || (locDetl.getBatch()==null && locDetlSource.getBatch()!=null)){ + locDetlSource = locDetlService.selectOne(new EntityWrapper<LocDetl>() + .eq("loc_no",locDetl.getLocNo()).eq("matnr",locDetl.getMatnr()).eq("batch",locDetl.getBatch())); + if (Cools.isEmpty(locDetlSource)){ + return R.error("寮傚父"); + } + } + LocDetl locDetlEnd = locDetlService.selectItem(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getSku()); + if (!Cools.isEmpty(locDetlEnd) && locDetl.getSku()==null && locDetlEnd.getBatch()!=null){ + locDetlEnd = locDetlService.selectOne(new EntityWrapper<LocDetl>() + .eq("loc_no",locDetl.getLocNo()).eq("matnr",locDetl.getMatnr()).eq("batch",locDetl.getSku())); + } + if (locDetlSource.getAnfme()-locDetl.getAnfme()==0){ + if (Cools.isEmpty(locDetlEnd)){ + locDetlSource.setBatch(locDetl.getSku()); + locDetlService.update(locDetlSource,new EntityWrapper<LocDetl>() + .eq("loc_no",locDetlSource.getLocNo()).eq("matnr",locDetlSource.getMatnr()).eq("batch",locDetl.getBatch())); + }else { + locDetlService.updateAnfme(locDetlEnd.getAnfme()+locDetl.getAnfme(),locDetlEnd.getLocNo(),locDetlEnd.getMatnr(),locDetlEnd.getBatch()); + locDetlService.delete(new EntityWrapper<LocDetl>() + .eq("loc_no",locDetl.getLocNo()).eq("matnr",locDetl.getMatnr()).eq("batch",locDetl.getBatch())); + } + }else if (locDetlSource.getAnfme()>locDetl.getAnfme()){ + locDetlService.updateAnfme(locDetlSource.getAnfme()-locDetl.getAnfme(),locDetlSource.getLocNo(),locDetlSource.getMatnr(),locDetlSource.getBatch()); + if (Cools.isEmpty(locDetlEnd)){ + locDetlSource.setAnfme(locDetl.getAnfme()); + locDetlSource.setBatch(locDetl.getSku()); + locDetlService.insert(locDetlSource); + }else { + locDetlService.updateAnfme(locDetlEnd.getAnfme()+locDetl.getAnfme(),locDetlEnd.getLocNo(),locDetlEnd.getMatnr(),locDetlEnd.getBatch()); + } + }else { + return R.error("杈撳叆鏁伴噺鏈夎锛岃瑙勮寖鎿嶄綔锛侊紒锛�"); + } + }catch (Exception e){ + return R.error("寮傚父"); } return new R(201,"鍚堝悓鍙蜂慨鏀规垚鍔燂紝璇峰埛鏂伴〉闈紒锛侊紒"); } diff --git a/src/main/webapp/static/js/locMast/locMast.js b/src/main/webapp/static/js/locMast/locMast.js index 054a10d..26fa8a5 100644 --- a/src/main/webapp/static/js/locMast/locMast.js +++ b/src/main/webapp/static/js/locMast/locMast.js @@ -468,6 +468,7 @@ maktx: $('#maktx').val(), zpallet: $('#zpallet').val(), specs: $('#specs').val(), + sku: $('#sku').val(), }; $.ajax({ diff --git a/src/main/webapp/views/report/locDetl_detail.html b/src/main/webapp/views/report/locDetl_detail.html index 49973ce..77d2879 100644 --- a/src/main/webapp/views/report/locDetl_detail.html +++ b/src/main/webapp/views/report/locDetl_detail.html @@ -16,9 +16,9 @@ <div id="data-detail" class="layer_self_wrap"> <form id="updateBatch" class="layui-form" style="height: 100%"> <div class="layui-inline" > - <label class="layui-form-label"><span class="not-null">*</span>鍚� 鍚� 鍙凤細</label> + <label class="layui-form-label"><span class="not-null">*</span>淇敼鍚堝悓鍙凤細</label> <div class="layui-input-inline"> - <input id="batch" class="layui-input" type="text" onkeyup="check(this.id, 'locDetl')"> + <input id="sku" class="layui-input" type="text" onkeyup="check(this.id, 'locDetl')"> </div> </div> <div class="layui-inline" > @@ -28,6 +28,12 @@ </div> </div> <div class="layui-inline" > + <label class="layui-form-label"><span class="not-null">*</span>鍘熷悎鍚屽彿锛�</label> + <div class="layui-input-inline"> + <input id="batch" class="layui-input" disabled ="disabled" type="text" onkeyup="check(this.id, 'locDetl')"> + </div> + </div> + <div class="layui-inline" > <label class="layui-form-label"><span class="not-null"></span>搴� 浣� 鍙凤細</label> <div class="layui-input-inline"> <input id="locNo" class="layui-input" disabled ="disabled" type="text" onkeyup="check(this.id, 'locDetl')"> -- Gitblit v1.9.1