From a52a9bd9365d22e430de95b60f2c3dd821457307 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期二, 13 一月 2026 16:38:57 +0800
Subject: [PATCH] 1.完善订单出库自动勾选 2.完善组托删除
---
src/main/java/com/zy/asrs/controller/WaitPakinController.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WaitPakinController.java b/src/main/java/com/zy/asrs/controller/WaitPakinController.java
index 7d994d8..8251da2 100644
--- a/src/main/java/com/zy/asrs/controller/WaitPakinController.java
+++ b/src/main/java/com/zy/asrs/controller/WaitPakinController.java
@@ -1,5 +1,6 @@
package com.zy.asrs.controller;
+import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
@@ -35,6 +36,8 @@
private OrderDetlService orderDetlService;
@Autowired
private WrkMastService wrkMastService;
+ @Autowired
+ private MobileController mobileController;
@RequestMapping(value = "/waitPakin/{id}/auth")
@ManagerAuth
@@ -91,7 +94,7 @@
@RequestMapping(value = "/waitPakin/delete/auth")
@ManagerAuth
- @Transactional
+// @Transactional
public R delete(@RequestParam String param){
List<WaitPakin> list = JSONArray.parseArray(param, WaitPakin.class);
if (Cools.isEmpty(list)){
@@ -102,12 +105,16 @@
if(!Cools.isEmpty(wrkMasts) || wrkMasts.size() > 0){
return R.error("鏉＄爜宸茬敓鎴愬叆搴撳伐浣滄。锛岀姝㈠垹闄�");
}
- waitPakinService.delete(new EntityWrapper<>(entity));
+ waitPakinService.delete(new EntityWrapper<WaitPakin>().eq("zpallet", entity.getZpallet()).eq("batch", entity.getBatch()));
//璁㈠崟鍏宠仈锛屼慨鏀硅鍗曚綔涓氭暟閲�
if (!Cools.isEmpty(entity.getOrderNo())) {
if (!orderDetlService.decrease(entity.getOrderNo(), entity.getMatnr(), entity.getBatch(), entity.getAnfme())) {
return R.error("璁㈠崟鏁版嵁鍥炴粴澶辫触");
}
+ }
+ //缁勬墭瑙ｇ粦鍚庤嚜鍔ㄥ璇ョ珯鐐硅繘琛岃В缁�
+ if(!Cools.isEmpty(entity.getMemo())){
+ R bind = mobileController.siteBindAndUnbind(entity.getMemo(),entity.getZpallet(), "UNBIND");
}
}
return R.ok();
@@ -150,4 +157,6 @@
return R.ok();
}
+
+
}
--
Gitblit v1.9.1