From b381a91b41726de9c0dccfb382eda4a3aecfd80f Mon Sep 17 00:00:00 2001 From: zjj <3272660260@qq.com> Date: 星期三, 13 九月 2023 16:14:52 +0800 Subject: [PATCH] #盘点完成 --- src/main/java/com/zy/asrs/entity/ManLocDetl.java | 2 src/main/java/com/zy/asrs/entity/LocCheck.java | 4 + src/main/java/com/zy/asrs/service/OrderCheckService.java | 4 + src/main/java/com/zy/asrs/service/impl/OrderCheckServiceImpl.java | 73 ++++++++++++++++++ src/main/java/com/zy/asrs/entity/param/ExamineParam.java | 25 ++++++ src/main/java/com/zy/asrs/controller/OrderCheckController.java | 17 +++- src/main/webapp/views/orderCheck/orderCheck.html | 14 +++ src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 10 ++ src/main/java/com/zy/asrs/controller/MobileController.java | 2 src/main/webapp/static/js/orderCheck/orderCheck.js | 40 ++------- 10 files changed, 152 insertions(+), 39 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java index 992a2ca..c6feda8 100644 --- a/src/main/java/com/zy/asrs/controller/MobileController.java +++ b/src/main/java/com/zy/asrs/controller/MobileController.java @@ -340,7 +340,7 @@ } @RequestMapping("/adjustNew/auth") - @ManagerAuth(memo = "鐩樼偣") + @ManagerAuth(memo = "pda鐩樼偣") public R adjustNew(@RequestBody MobileAdjustNewParam combParam){ mobileService.adjustNew(combParam, getUserId()); return R.ok("鐩樼偣鎴愬姛"); diff --git a/src/main/java/com/zy/asrs/controller/OrderCheckController.java b/src/main/java/com/zy/asrs/controller/OrderCheckController.java index 62ed75c..e6e9da7 100644 --- a/src/main/java/com/zy/asrs/controller/OrderCheckController.java +++ b/src/main/java/com/zy/asrs/controller/OrderCheckController.java @@ -11,10 +11,7 @@ import com.core.common.*; import com.core.exception.CoolException; import com.zy.asrs.entity.*; -import com.zy.asrs.entity.param.CheckDTO; -import com.zy.asrs.entity.param.MatnrDto; -import com.zy.asrs.entity.param.OrderCheckParam; -import com.zy.asrs.entity.param.OrderDomainParam; +import com.zy.asrs.entity.param.*; import com.zy.asrs.entity.result.KeyValueVo; import com.zy.asrs.service.*; import com.zy.common.CodeRes; @@ -65,6 +62,18 @@ @Autowired private LocCheckTrimService locCheckTrimService; + @RequestMapping(value = "/orderCheck/examine") + @ManagerAuth(memo = "瀹℃牳鐩樼偣鍗�") + @Transactional + public R examine(@RequestBody ExamineParam param){ + orderCheckService.examine(param); + + return R.ok("瀹℃牳瀹屾垚"); + } + + + + @RequestMapping(value = "/orderCheck/nav/list/auth") @ManagerAuth public R navList(@RequestParam(required = false) String orderNo){ diff --git a/src/main/java/com/zy/asrs/entity/LocCheck.java b/src/main/java/com/zy/asrs/entity/LocCheck.java index f40f3a5..0fd24a0 100644 --- a/src/main/java/com/zy/asrs/entity/LocCheck.java +++ b/src/main/java/com/zy/asrs/entity/LocCheck.java @@ -145,6 +145,10 @@ @ExcelProperty({"鐩樼偣鍗�", "鐪熷疄鏁伴噺"}) private Double realAnfme; + @ApiModelProperty(value= "鎵规") + @TableField("batch") + private String batch; + public String getOwner$(){ LocOwnerService service = SpringUtils.getBean(LocOwnerService.class); LocOwner locOwner = service.selectById(this.owner); diff --git a/src/main/java/com/zy/asrs/entity/ManLocDetl.java b/src/main/java/com/zy/asrs/entity/ManLocDetl.java index 68c906b..5b089cd 100644 --- a/src/main/java/com/zy/asrs/entity/ManLocDetl.java +++ b/src/main/java/com/zy/asrs/entity/ManLocDetl.java @@ -217,7 +217,7 @@ @ApiModelProperty(value= "娣诲姞鏃堕棿") @TableField("real_anfme") - private Date realAnfme; + private Double realAnfme; @ApiModelProperty(value= "璁㈠崟鍙�") @TableField("order_no") diff --git a/src/main/java/com/zy/asrs/entity/param/ExamineParam.java b/src/main/java/com/zy/asrs/entity/param/ExamineParam.java new file mode 100644 index 0000000..2ff3a46 --- /dev/null +++ b/src/main/java/com/zy/asrs/entity/param/ExamineParam.java @@ -0,0 +1,25 @@ +package com.zy.asrs.entity.param; + +import com.zy.asrs.entity.ManLocDetl; +import lombok.Data; + +import java.util.List; +@Data +public class ExamineParam { + + private String orderNo; + + private List<data> list; + + + @Data + public static class data{ + private String orderNo; + private String locNo; + private Double anfme; + private String matnr; + private String maktx; + private Double realAnfme; + } + +} diff --git a/src/main/java/com/zy/asrs/service/OrderCheckService.java b/src/main/java/com/zy/asrs/service/OrderCheckService.java index 0291016..8e6e78d 100644 --- a/src/main/java/com/zy/asrs/service/OrderCheckService.java +++ b/src/main/java/com/zy/asrs/service/OrderCheckService.java @@ -1,7 +1,9 @@ package com.zy.asrs.service; import com.baomidou.mybatisplus.service.IService; +import com.core.common.R; import com.zy.asrs.entity.*; +import com.zy.asrs.entity.param.ExamineParam; import java.util.List; @@ -29,4 +31,6 @@ List<OrderCheck> selectToBeHistoryOrder(); void remove(String orderNo); + + R examine(ExamineParam param); } diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java index 2cc459f..ddafb63 100644 --- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java @@ -83,6 +83,9 @@ @Autowired private LocCheckService locCheckService; + @Autowired + private OrderCheckService orderCheckService; + @Override @@ -920,6 +923,7 @@ locCheck.setCreateTime(now); locCheck.setUpdateTime(now); locCheck.setOrderNo(combParam.getOrderNo()); + locCheck.setBatch(detl.getBatch()); if (!locCheckService.insert(locCheck)){ return R.error("鐩樼偣鏄庣粏鎻掑叆澶辫触"); @@ -937,6 +941,12 @@ } + OrderCheck orderCheck = orderCheckService.selectOne(new EntityWrapper<OrderCheck>().eq("order_no", combParam.getOrderNo())); + orderCheck.setSettle(2L); + if (!orderCheckService.update(orderCheck,new EntityWrapper<OrderCheck>().eq("order_no", combParam.getOrderNo()))){ + return R.error("鏇存柊鐩樼偣鍗曠姸鎬佸け璐ワ紒"); + } + return R.ok("鐩樼偣鎴愬姛"); } diff --git a/src/main/java/com/zy/asrs/service/impl/OrderCheckServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderCheckServiceImpl.java index 2766cf0..29698e0 100644 --- a/src/main/java/com/zy/asrs/service/impl/OrderCheckServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/OrderCheckServiceImpl.java @@ -4,9 +4,11 @@ import com.baomidou.mybatisplus.service.impl.ServiceImpl; import com.core.common.Cools; import com.core.common.DateUtils; +import com.core.common.R; import com.core.common.SnowflakeIdWorker; import com.core.exception.CoolException; import com.zy.asrs.entity.*; +import com.zy.asrs.entity.param.ExamineParam; import com.zy.asrs.entity.param.OpenOrderPakinParam; import com.zy.asrs.entity.param.OpenOrderPakoutParam; import com.zy.asrs.mapper.OrderCheckMapper; @@ -19,6 +21,7 @@ import org.springframework.stereotype.Service; import java.util.ArrayList; +import java.util.Date; import java.util.List; @Slf4j @@ -40,6 +43,14 @@ @Autowired private LocCheckService locCheckService; + + @Autowired + private ManLocDetlService manLocDetlService; + + @Autowired + private NodeService nodeService; + @Autowired + private OrderCheckService orderCheckService; @Override public OrderCheck selectByNo(String orderNo) { @@ -179,5 +190,67 @@ locCheckService.delete(new EntityWrapper<LocCheck>().eq("order_no", orderNo)); } + @Override + public R examine(ExamineParam param) { + for (ExamineParam.data list:param.getList()){ + EntityWrapper<ManLocDetl> wrapper = new EntityWrapper<>(); + wrapper.eq("matnr", list.getMatnr()) + .eq("loc_no", list.getLocNo()); + + ManLocDetl manLocDetl = manLocDetlService.selectOne(wrapper); + if (manLocDetl == null){ + Date now = new Date(); + + Node node = nodeService.selectOne(new EntityWrapper<Node>().eq("name", list.getLocNo())); + + ManLocDetl manLocDetl1 = new ManLocDetl(); + + manLocDetl1.setLocNo(list.getLocNo()); + manLocDetl1.setNodeId(node.getId()); + manLocDetl1.setAnfme(list.getRealAnfme()); + manLocDetl1.setMatnr(list.getMatnr()); + manLocDetl1.setMaktx(list.getMaktx()); + manLocDetl1.setStatus(1); + manLocDetl1.setCreateTime(now); + manLocDetl1.setModiTime(now); + manLocDetl1.setOrderNo(list.getOrderNo()); + manLocDetl1.setStockFreeze(1); + + if (!manLocDetlService.insert(manLocDetl1)){ + return R.error("鎻掑叆鏁版嵁澶辫触"); + } + + }else { + if (list.getRealAnfme() == 0){ + if (!manLocDetlService.delete(wrapper)){ + return R.error("鍒犻櫎鏁版嵁澶辫触锛�"); + } + }else { + manLocDetl.setAnfme(list.getRealAnfme()); + if (!manLocDetlService.update(manLocDetl,wrapper)){ + return R.error("鏇存柊搴撳瓨鏁伴噺澶辫触锛�"); + } + } + } + + EntityWrapper<LocCheck> wrapper2 = new EntityWrapper<>(); + wrapper2.eq("order_no", list.getOrderNo()) + .eq("matnr", list.getMatnr()) + .eq("loc_no", list.getLocNo()); + LocCheck checkDetl = locCheckService.selectOne(wrapper2); + checkDetl.setType(2); + if (!locCheckService.update(checkDetl,wrapper2)){ + return R.error("鏇存柊鐩樼偣鏄庣粏澶辫触锛�"); + } + } + OrderCheck orderCheck = orderCheckService.selectOne(new EntityWrapper<OrderCheck>().eq("order_no", param.getOrderNo())); + orderCheck.setSettle(4L); + if (!orderCheckService.update(orderCheck,new EntityWrapper<OrderCheck>().eq("order_no", param.getOrderNo()))){ + return R.error("鏇存柊鐩樼偣鍗曠姸鎬佸け璐ワ紒"); + } + + return R.ok(); +} + } diff --git a/src/main/webapp/static/js/orderCheck/orderCheck.js b/src/main/webapp/static/js/orderCheck/orderCheck.js index 9974fc3..ae2a8e0 100644 --- a/src/main/webapp/static/js/orderCheck/orderCheck.js +++ b/src/main/webapp/static/js/orderCheck/orderCheck.js @@ -138,8 +138,8 @@ {field: 'anfme', title: '鏁伴噺'}, {field: 'realAnfme', title: '鐪熷疄鏁伴噺',style: 'color: blue;font-weight: bold', edit: true}, {field: 'diffAnfme', title: '宸紓鏁伴噺', style: 'font-weight: bold'}, - {field: 'type$', title: '鐘舵��'}, - {align: 'center', title: '鎿嶄綔', toolbar: '#formSSXMTableBar3', minWidth: 80, width: 80, fixed: 'right'} + {field: 'type$', title: '鐘舵��'} + ]], request: { pageName: 'curr', @@ -268,9 +268,9 @@ {field: 'anfme', title: '搴撳瓨鏁伴噺'}, {field: 'realAnfme', title: '鐪熷疄鏁伴噺'}, {field: 'diffAnfme', title: '宸紓鏁伴噺', style: 'font-weight: bold'}, - {field: 'type$', title: '鐘舵��'}, + {field: 'type$', title: '鐘舵��'} - {align: 'center', title: '鎿嶄綔', toolbar: '#formSSXMTableBarr', minWidth: 80, width: 80, fixed: 'right'} + ]], done: function (res) { $(layero).find('.layui-table-view').css('margin', '0'); @@ -782,49 +782,28 @@ function examine(expTpe) { admin.open({ type: 1, - title: (expTpe ? '淇敼' : '娣诲姞') + '鐩樼偣鍗�', + title: '瀹℃牳鐩樼偣鍗�', content: $('#editDialog2').html(), area: '1300px', success: function (layero, dIndex) { $(layero).children('.layui-layer-content').css('overflow', 'visible'); var isExpAdd = !expTpe; // 鍥炴樉鏁版嵁 - form.val('editForm', expTpe); + form.val('editForm2', expTpe); if (expTpe) { $('#orderNo').attr("disabled", "disabled"); } // 琛ㄥ崟鎻愪氦浜嬩欢 - form.on('submit(orderEditSubmit)', function (data) { - // 缁勮鏁版嵁 - if (xxDataList.length <= 0) { - layer.tips('璇锋坊鍔犲崟鎹槑缁�', '#matAddBtnComment', {tips: [1, '#ff4c4c']}); - return false; - } - if (data.field.orderNo == "" || data.field.orderNo == null) { - layer.tips('璇疯緭鍏ョ洏鐐瑰崟缂栧彿', '#orderNo', {tips: [1, '#ff4c4c']}); - return false; - } + form.on('submit(examine)', function (data) { let nList = admin.util.deepClone(xxDataList); - // for (let xi = 0; xi < nList.length; xi++) { - // if (nList[xi].anfme <= 0){ - // layer.msg('鏄庣粏淇敼鏁伴噺涓嶅悎娉�', {icon: 2}); - // return false; - // } - // if (nList[xi].anfme < nList[xi].workQty){ - // layer.msg('鏁伴噺涓嶈兘灏忎簬宸蹭綔涓氭暟閲�', {icon: 2}); - // return false; - // } - // } layer.load(2); console.log(data); $.ajax({ - url: baseUrl + "/orderCheck/form/" + (isExpAdd ? "add" : "modify") + "/auth", + url: baseUrl + "/orderCheck/examine", headers: {'token': localStorage.getItem('token')}, data: JSON.stringify({ - orderId: Number(data.field.id), - docType: Number(data.field.docType), orderNo: data.field.orderNo, - orderDetlList: nList + list: nList }), contentType: 'application/json;charset=UTF-8', method: 'POST', @@ -862,7 +841,6 @@ {field: 'realAnfme', title: '鐪熷疄鏁伴噺'}, {field: 'diffAnfme', title: '宸紓鏁伴噺', style: 'font-weight: bold'}, {field: 'type$', title: '鐘舵��'} - ]], done: function (res) { diff --git a/src/main/webapp/views/orderCheck/orderCheck.html b/src/main/webapp/views/orderCheck/orderCheck.html index c61eea3..5935e23 100644 --- a/src/main/webapp/views/orderCheck/orderCheck.html +++ b/src/main/webapp/views/orderCheck/orderCheck.html @@ -93,7 +93,11 @@ </div> <!-- 琛ㄦ牸鎿嶄綔鍒� --> <script type="text/html" id="operate"> + + {{# if (d.settle == 0 || d.settle == 1 || d.settle ==2) { }} <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="examine">瀹℃牳</a> + {{# } }} + {{# if (d.settle == 0 || d.settle == 1) { }} <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a> @@ -185,9 +189,15 @@ </script> <script type="text/html" id="editDialog2"> - <form id="editForm2" lay-filter="editForm" class="layui-form model-form"> + <form id="editForm2" lay-filter="editForm2" class="layui-form model-form"> <input name="id" type="hidden"/> <div class="layui-form-item"> + <label class="layui-form-label">鐩樼偣鍗曞彿锛�</label> + <div class="layui-input-block"> + <input id="orderNo" name="orderNo" placeholder="杈撳叆鍗曟嵁缂栧彿" type="text" class="layui-input" maxlength="20" lay-verType="tips" /> + <!-- lay-verify="required"--> + </div> + </div> @@ -200,7 +210,7 @@ </div> <div class="layui-form-item text-right"> <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button> - <button class="layui-btn" lay-filter="orderEditSubmit" lay-submit>淇濆瓨</button> + <button class="layui-btn" lay-filter="examine" lay-submit>瀹屾垚瀹℃牳</button> </div> </form> </script> -- Gitblit v1.9.1