From 7a99dc66a52651adffaa919fb03e73136986b775 Mon Sep 17 00:00:00 2001 From: Junjie <540245094@qq.com> Date: 星期二, 29 七月 2025 13:44:41 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/controller/OrderController.java | 77 ++++++++++++++++++++++++++++++++++++++ src/main/webapp/views/orderPakout/out.html | 1 src/main/webapp/static/js/orderPakout/out.js | 34 ++++++++++++++++ 3 files changed, 111 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java index c4e3732..389ce8f 100644 --- a/src/main/java/com/zy/asrs/controller/OrderController.java +++ b/src/main/java/com/zy/asrs/controller/OrderController.java @@ -14,6 +14,14 @@ import com.zy.asrs.utils.MathUtils; import com.zy.common.model.DetlDto; import com.zy.common.web.BaseController; +import com.zy.nc.entity.NccCgCgdhdWms; +import com.zy.nc.entity.NccSaleDbddWms; +import com.zy.nc.entity.NccSaleXsfhmxWms; +import com.zy.nc.entity.NccScZkmxbWms; +import com.zy.nc.service.NccCgCgdhdWmsService; +import com.zy.nc.service.NccSaleDbddWmsService; +import com.zy.nc.service.NccSaleXsfhmxWmsService; +import com.zy.nc.service.NccScZkmxbWmsService; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; @@ -28,6 +36,10 @@ private OrderService orderService; @Autowired private OrderDetlService orderDetlService; + @Autowired + private OrderPakoutService orderPakoutService; + @Autowired + private OrderDetlPakoutService orderDetlPakoutService; @Autowired private SnowflakeIdWorker snowflakeIdWorker; @Autowired @@ -44,6 +56,15 @@ private WrkMastService wrkMastService; @Autowired private WrkMastLogService wrkMastLogService; + + @Autowired + private NccSaleXsfhmxWmsService nccSaleXsfhmxWmsService; + @Autowired + private NccCgCgdhdWmsService nccCgCgdhdWmsService; + @Autowired + private NccScZkmxbWmsService nccScZkmxbWmsService; + @Autowired + private NccSaleDbddWmsService nccSaleDbddWmsService; @RequestMapping(value = "/order/nav/list/auth") @ManagerAuth @@ -501,4 +522,60 @@ return R.ok(); } + @RequestMapping(value = "/order/restartSyncOrder") + @ManagerAuth(memo = "閲嶆柊鍚屾鍑哄簱璁㈠崟") + public R restartSyncOrder(@RequestBody List<Long> ids) { + if (ids.isEmpty()) { + return R.error(); + } + OrderDetlPakout orderDetlPakout = orderDetlPakoutService.selectById(ids.get(0)); + if (orderDetlPakout == null) { + return R.error(); + } + + String orderNoStr = orderDetlPakout.getOrderNo(); + String[] split = orderNoStr.split("-"); + String orderNo = split[0]; + + List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().like("order_no", orderNo)); + if (!wrkDetls.isEmpty()) { + return R.error("璁㈠崟宸茶鎵ц锛屾棤娉曞悓姝�"); + } + + List<WrkDetlLog> wrkDetlLogs = wrkDetlLogService.selectList(new EntityWrapper<WrkDetlLog>().like("order_no", orderNo)); + if (!wrkDetlLogs.isEmpty()) { + return R.error("璁㈠崟宸茶鎵ц锛屾棤娉曞悓姝�"); + } + + OrderPakout orderPakout = orderPakoutService.selectByNo(orderNo); + if(orderPakout == null) { + return R.error("鍑哄簱璁㈠崟涓嶅瓨鍦�"); + } + + if (orderPakout.getDocType$().equals("閿�鍞彂璐�")) { + NccSaleXsfhmxWms nccSaleXsfhmxWms = new NccSaleXsfhmxWms(); + nccSaleXsfhmxWms.setWmsFlag(0); + nccSaleXsfhmxWmsService.update(nccSaleXsfhmxWms, new EntityWrapper<NccSaleXsfhmxWms>().eq("vbillcode", orderNo)); + } else if (orderPakout.getDocType$().equals("閲囪喘鍒拌揣")) { + NccCgCgdhdWms nccCgCgdhdWms = new NccCgCgdhdWms(); + nccCgCgdhdWms.setWmsFlag(0); + nccCgCgdhdWmsService.update(nccCgCgdhdWms, new EntityWrapper<NccCgCgdhdWms>().eq("vbillcode", orderNo)); + } else if (orderPakout.getDocType$().equals("杞簱-鍑哄簱")) { + NccScZkmxbWms nccScZkmxbWms = new NccScZkmxbWms(); + nccScZkmxbWms.setWmsFlag(0); + nccScZkmxbWmsService.update(nccScZkmxbWms, new EntityWrapper<NccScZkmxbWms>().eq("vbillcode", orderNo)); + } else if (orderPakout.getDocType$().equals("璋冩嫧鍑哄簱")) { + NccSaleDbddWms nccSaleDbddWms = new NccSaleDbddWms(); + nccSaleDbddWms.setWmsFlag(0); + nccSaleDbddWmsService.update(nccSaleDbddWms, new EntityWrapper<NccSaleDbddWms>().eq("vbillcode", orderNo)); + } + + orderDetlPakoutService.delete(new EntityWrapper<OrderDetlPakout>().like("order_no", orderNo)); + orderPakoutService.delete(new EntityWrapper<OrderPakout>().like("order_no", orderNo)); + + orderDetlService.delete(new EntityWrapper<OrderDetl>().like("order_no", orderNo)); + orderService.delete(new EntityWrapper<Order>().like("order_no", orderNo)); + return R.ok(); + } + } diff --git a/src/main/webapp/static/js/orderPakout/out.js b/src/main/webapp/static/js/orderPakout/out.js index d84ce61..3a63460 100644 --- a/src/main/webapp/static/js/orderPakout/out.js +++ b/src/main/webapp/static/js/orderPakout/out.js @@ -117,7 +117,6 @@ /* 琛ㄦ牸2澶村伐鍏锋爮鐐瑰嚮浜嬩欢 */ table.on('toolbar(orderDetlTable)', function (obj) { - var checkStatus = table.checkStatus(obj.config.id).data; if (obj.event === 'pakoutPreview') { // 娣诲姞 if (checkStatus.length === 0) { @@ -137,9 +136,42 @@ return d.id; }); doDelSensor({ids: ids}); + } else if (obj.event === 'restartSync') { + restartSyncOrder(checkStatus.map(function (d) { + return d.id; + })) } }); + function restartSyncOrder(ids) { + layer.confirm('纭畾瑕侀噸鏂板悓姝ヨ璁㈠崟鏁版嵁鍚楋紵', { + skin: 'layui-layer-admin', + shade: .1 + }, function (i) { + layer.close(i); + var loadIndex = layer.load(2); + $.ajax({ + url: baseUrl+"/order/restartSyncOrder", + headers: {'token': localStorage.getItem('token')}, + contentType: 'application/json;charset=UTF-8', + data: JSON.stringify(ids), + method: 'POST', + success: function (res) { + layer.close(loadIndex); + if (res.code === 200){ + layer.msg(res.msg, {icon: 1}); + $(".layui-laypage-btn")[0].click(); + } else if (res.code === 403){ + top.location.href = baseUrl+"/"; + }else { + layer.msg(res.msg, {icon: 2}); + } + } + }) + + }); + } + /* 琛ㄦ牸2宸ュ叿鏉$偣鍑讳簨浠� */ table.on('tool(orderDetlTable)', function (obj) { console.log(obj); diff --git a/src/main/webapp/views/orderPakout/out.html b/src/main/webapp/views/orderPakout/out.html index b2047f4..ec8d523 100644 --- a/src/main/webapp/views/orderPakout/out.html +++ b/src/main/webapp/views/orderPakout/out.html @@ -163,6 +163,7 @@ <!-- </div>--> <!-- </div>--> <button class="layui-btn layui-btn-sm layui-btn-danger btn-pakoutPreview" id="btn-pakoutPreview" lay-event="pakoutPreview">鎵归噺鍑哄簱</button> + <button class="layui-btn layui-btn-sm layui-btn-danger btn-pakoutPreview" id="btn-restartSync" lay-event="restartSync">閲嶆柊鍚屾</button> </script> -- Gitblit v1.9.1