From 1b79d0f4e8430353342e284e1de6ce220cb4a1f1 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期一, 10 十一月 2025 09:09:59 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/controller/OrderPakoutController.java | 10 ++++
src/main/java/com/zy/asrs/service/impl/OrderPakoutServiceImpl.java | 6 +++
src/main/webapp/static/js/orderPakout/order.js | 38 ++++++++++++++++++-
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 2
src/main/webapp/views/index.html | 2
src/main/java/com/zy/asrs/mapper/OrderPakoutMapper.java | 2 +
src/main/resources/mapper/OrderPakoutMapper.xml | 10 +++++
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 5 ++
src/main/webapp/views/orderPakout/order.html | 18 +++++----
src/main/java/com/zy/asrs/service/OrderPakoutService.java | 2 +
10 files changed, 82 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderPakoutController.java b/src/main/java/com/zy/asrs/controller/OrderPakoutController.java
index 851ec8f..1049bd0 100644
--- a/src/main/java/com/zy/asrs/controller/OrderPakoutController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderPakoutController.java
@@ -243,7 +243,7 @@
}
@RequestMapping(value = "/order/delete/auth")
- @ManagerAuth(memo = "鎵嬪姩鍒犻櫎璁㈠崟")
+ @ManagerAuth(memo = "鎵嬪姩鍒犻櫎璁″垝缁勮揣鍗�")
@Transactional
public R delete(@RequestParam Long orderId){
orderService.remove(orderId);
@@ -258,6 +258,14 @@
return R.ok();
}
+ @RequestMapping(value = "/order/abandoned/auth")
+ @ManagerAuth(memo = "鎵嬪姩搴熷純璁″垝缁勮揣鍗�")
+ @Transactional
+ public R abandoned(@RequestParam Long orderId){
+ orderService.updateSettle(orderId,99L,getUserId());
+ return R.ok();
+ }
+
@RequestMapping(value = "/order/export/auth")
@ManagerAuth
public R export(@RequestBody JSONObject param){
diff --git a/src/main/java/com/zy/asrs/mapper/OrderPakoutMapper.java b/src/main/java/com/zy/asrs/mapper/OrderPakoutMapper.java
index 56380bf..a978485 100644
--- a/src/main/java/com/zy/asrs/mapper/OrderPakoutMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/OrderPakoutMapper.java
@@ -16,6 +16,8 @@
List<OrderPakout> selectComplete();
+ void removeGroupGoodsNoUpdate(@Param("itemName")String itemName,@Param("orderNo")String orderNo);
+
int addToLogTable(OrderPakout order);
List<OrderPakout> selectorderNoL(@Param("orderNo")String orderNo);
diff --git a/src/main/java/com/zy/asrs/service/OrderPakoutService.java b/src/main/java/com/zy/asrs/service/OrderPakoutService.java
index 2ea6682..3d59607 100644
--- a/src/main/java/com/zy/asrs/service/OrderPakoutService.java
+++ b/src/main/java/com/zy/asrs/service/OrderPakoutService.java
@@ -22,6 +22,8 @@
boolean addToLogTable(OrderPakout order);
+ void removeGroupGoodsNoUpdate(String a,String orderNo);
+
List<OrderPakout> selectorderNoL(String orderNo);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index b16528f..0f4a444 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -80,6 +80,8 @@
private LocMastService locMastService;
@Autowired
private RgvOneSignService rgvOneSignService;
+ @Autowired
+ private OrderPakoutService orderPakoutService;
@Override
@Transactional
@@ -1207,6 +1209,9 @@
try{
List<OrderOutLocBoxCsUtilParam> OutLocBoxCs = new ArrayList<>();
String orderNo = "ZH" + snowflakeIdWorker.nextId();
+
+ orderPakoutService.removeGroupGoodsNoUpdate(param.getGroupGoodsNo(),orderNo);
+
for (OrderCargoBookingNoteParam.Box box : param.getBoxList()){
for (OrderCargoBookingNoteParam.Box.Roll roll : box.getRollList()){
OrderOutLocBoxCsUtilParam outLocBox = new OrderOutLocBoxCsUtilParam();
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderPakoutServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderPakoutServiceImpl.java
index 67cc8f9..c13c6aa 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderPakoutServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderPakoutServiceImpl.java
@@ -54,6 +54,12 @@
orderDetlPakoutService.delete(new EntityWrapper<OrderDetlPakout>().eq("order_id", orderId));
}
+
+ @Override
+ public void removeGroupGoodsNoUpdate(String itemName,String orderNo) {
+ this.baseMapper.removeGroupGoodsNoUpdate(itemName,orderNo);
+ }
+
@Override
public List<OrderPakout> selectComplete() {
return this.baseMapper.selectComplete();
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index 7e78d84..ef48815 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -341,7 +341,7 @@
null, // 鍙戣揣鏃堕棿
null, // 鐗╂祦鍚嶇О
null, // 鐗╂祦鍗曞彿
- 9L, // 璁㈠崟鐘舵��
+ 10L, // 璁㈠崟鐘舵��
1, // 鐘舵��
userId, // 娣诲姞浜哄憳
now, // 娣诲姞鏃堕棿
diff --git a/src/main/resources/mapper/OrderPakoutMapper.xml b/src/main/resources/mapper/OrderPakoutMapper.xml
index 537817d..caf4a69 100644
--- a/src/main/resources/mapper/OrderPakoutMapper.xml
+++ b/src/main/resources/mapper/OrderPakoutMapper.xml
@@ -84,4 +84,14 @@
</if>
</select>
+ <update id="removeGroupGoodsNoUpdate">
+ update man_order_pakout
+ set settle = 99
+ ,update_time = getdate()
+ where 1=1
+ and item_name = #{itemName}
+ and order_no != #{orderNo}
+ and (settle = 10 or settle = 98)
+ </update>
+
</mapper>
diff --git a/src/main/webapp/static/js/orderPakout/order.js b/src/main/webapp/static/js/orderPakout/order.js
index 6fa4030..dbd573e 100644
--- a/src/main/webapp/static/js/orderPakout/order.js
+++ b/src/main/webapp/static/js/orderPakout/order.js
@@ -57,7 +57,7 @@
{align: 'center', title: '鏄庣粏', toolbar: '#tbLook', minWidth: 160, width: 160},
{field: 'createTime$', title: '鍒涘缓鏃堕棿', minWidth: 200, width: 200},
{field: 'settle$', align: 'center', title: '鐘舵��', templet: '#settleTpl', minWidth: 160, width: 160},
- {field: 'memo', align: 'center',title: '澶囨敞', hide: true},
+ {field: 'memo', align: 'center',title: '澶囨敞', hide: false},
{align: 'center', title: '鎿嶄綔', toolbar: '#operate'}
]],
request: {
@@ -176,7 +176,9 @@
priReduce(data.id);
} else if (layEvent === 'del') {
doDel(data.id);
- } else if (layEvent === 'complete') {//杞疄闄呯粍璐у崟
+ } else if (layEvent === 'abandoned') {
+ doModify(data.id, data.orderNo, 99);
+ } else if (layEvent === 'complete') {
doModify(data.id, data.orderNo, 11);
} else if (layEvent === 'look') {
var $a = $(obj.tr).find('a[lay-event="look"]');
@@ -524,6 +526,38 @@
})
});
}
+ function doAbandoned(orderId) {
+ layer.confirm('纭畾瑕佸簾寮冭鍒掔粍璐у崟鍚楋紵', {
+ shade: .1,
+ skin: 'layui-layer-admin'
+ }, function (i) {
+ layer.close(i);
+ layer.load(2);
+ $.ajax({
+ url: baseUrl+"/order/pakout/order/abandoned/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {
+ orderId: orderId
+ },
+ method: 'POST',
+ success: function (res) {
+ layer.closeAll('loading');
+ if (res.code === 200){
+ if (insTbCount === 0) {
+ insTb.reload({page: {curr: 1}});
+ } else {
+ $(".layui-laypage-btn")[0].click();
+ }
+ layer.msg(res.msg, {icon: 1});
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ });
+ }
// 淇敼璁㈠崟鐘舵��
function doModify(orderId, orderNo, settle) {
diff --git a/src/main/webapp/views/index.html b/src/main/webapp/views/index.html
index cda82d7..7f1694f 100644
--- a/src/main/webapp/views/index.html
+++ b/src/main/webapp/views/index.html
@@ -168,7 +168,7 @@
success: function (res) {
if (res.code == 200) {
let days = res.data
- if (days <= 33) {
+ if (days <= 10) {
showPopup(res.data)
} else {
showPopup("");
diff --git a/src/main/webapp/views/orderPakout/order.html b/src/main/webapp/views/orderPakout/order.html
index 2d6f79e..1f8e13f 100644
--- a/src/main/webapp/views/orderPakout/order.html
+++ b/src/main/webapp/views/orderPakout/order.html
@@ -79,13 +79,11 @@
<div class="layui-input-inline">
<select name="settle">
<option value="">閫夋嫨鐘舵��</option>
- <option value="1">寰呭鐞�</option>
- <option value="9">寰呭垽鏌ヨ涓�</option>
- <option value="10">灏辩华</option>
+ <option value="10">寰呭鐞�</option>
<option value="11">鐢熸垚瀹為檯缁勮揣鍗曚腑銆傝绛夊緟...</option>
- <option value="12">鐢熸垚瀹為檯缁勮揣鍗曟垚鍔�</option>
- <option value="13">鐢熸垚瀹為檯缁勮揣鍗曞け璐�</option>
- <option value="99">寮傚父</option>
+ <option value="12">寰呬笂鎶�</option>
+ <option value="98">寮傚父</option>
+ <option value="99">搴熷純</option>
</select>
</div>
</div>
@@ -110,12 +108,16 @@
<!-- 琛ㄦ牸鎿嶄綔鍒� -->
<script type="text/html" id="operate">
- {{# if (d.settle != 11) { }}
- <a class="layui-btn layui-btn-danger layui-btn-xs btn-delete" lay-event="del">鍒犻櫎</a>
+ {{# if (d.settle == 10 || d.settle == 12) { }}
+ <a class="layui-btn layui-btn-danger layui-btn-xs btn-delete" lay-event="abandoned">搴熷純</a>
+<!-- <a class="layui-btn layui-btn-danger layui-btn-xs btn-delete" lay-event="del">鍒犻櫎</a>-->
{{# } }}
{{# if (d.settle == 10) { }}
<a class="layui-btn layui-btn-primary layui-border-blue layui-btn-xs btn-complete" lay-event="complete">鐢熸垚瀹為檯缁勮揣鍗�</a>
{{# } }}
+ {{# if (d.settle == 98) { }}
+ <a class="layui-btn layui-btn-primary layui-border-blue layui-btn-xs btn-complete" lay-event="complete">閲嶆柊鐢熸垚瀹為檯缁勮揣鍗�</a>
+ {{# } }}
</script>
<!-- 琛ㄦ牸鎿嶄綔鍒� -->
<script type="text/html" id="tbLook">
--
Gitblit v1.9.1