From d8282bc83c48030c3338ce014a88574d1bbfe895 Mon Sep 17 00:00:00 2001
From: bfwms <1>
Date: 星期六, 29 三月 2025 16:50:59 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/controller/WaitPakinController.java | 57 ++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 48 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WaitPakinController.java b/src/main/java/com/zy/asrs/controller/WaitPakinController.java
index ef4582e..0dd8ccf 100644
--- a/src/main/java/com/zy/asrs/controller/WaitPakinController.java
+++ b/src/main/java/com/zy/asrs/controller/WaitPakinController.java
@@ -10,8 +10,14 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
+import com.zy.asrs.entity.Order;
+import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.entity.WaitPakin;
+import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.service.OrderDetlService;
+import com.zy.asrs.service.OrderService;
import com.zy.asrs.service.WaitPakinService;
+import com.zy.asrs.service.WrkMastService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -26,6 +32,15 @@
@Autowired
private WaitPakinService waitPakinService;
+
+ @Autowired
+ private WrkMastService wrkMastService;
+
+ @Autowired
+ private OrderService orderService;
+
+ @Autowired
+ private OrderDetlService orderDetlService;
@RequestMapping(value = "/waitPakin/{id}/auth")
@ManagerAuth
@@ -44,17 +59,21 @@
EntityWrapper<WaitPakin> wrapper = new EntityWrapper<>();
convert(param, wrapper);
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ else {
+ wrapper.orderBy("modi_time", false);
+ }
return R.ok(waitPakinService.selectPage(new Page<>(curr, limit), wrapper));
}
private void convert(Map<String, Object> map, EntityWrapper wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
- if (entry.getKey().endsWith(">")) {
- wrapper.ge(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
- } else if (entry.getKey().endsWith("<")) {
- wrapper.le(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
+ String val = String.valueOf(entry.getValue());
+ if (val.contains(RANGE_TIME_LINK)){
+ String[] dates = val.split(RANGE_TIME_LINK);
+ wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
+ wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
} else {
- wrapper.like(entry.getKey(), String.valueOf(entry.getValue()));
+ wrapper.like(entry.getKey(), val);
}
}
}
@@ -69,7 +88,7 @@
@RequestMapping(value = "/waitPakin/update/auth")
@ManagerAuth
public R update(WaitPakin waitPakin){
- if (Cools.isEmpty(waitPakin) || null==waitPakin.getId()){
+ if (Cools.isEmpty(waitPakin)){
return R.error();
}
waitPakinService.updateById(waitPakin);
@@ -84,7 +103,27 @@
return R.error();
}
for (WaitPakin entity : list){
- waitPakinService.delete(new EntityWrapper<>(entity));
+ WrkMast wrkMast = wrkMastService.selectByBarcode(entity.getBarcode());
+ if (Cools.isEmpty(wrkMast)) {
+ Order order = orderService.selectByNo(entity.getOrderNo());
+ if (!Cools.isEmpty(order)) {
+ String matnr = entity.getMatnr();
+ Double anfme = entity.getAnfme();
+ List<OrderDetl> orderDetls = orderService.selectTotalDetls(order.getId());
+ for (OrderDetl orderDetl : orderDetls) {
+ if (matnr.equals(orderDetl.getMatnr())) {
+ orderDetl.setQty(orderDetl.getQty() - anfme);
+ orderDetlService.updateById(orderDetl);
+ }
+ }
+ waitPakinService.delete(new EntityWrapper<>(entity));
+ } else {
+ waitPakinService.delete(new EntityWrapper<>(entity));
+ }
+ } else {
+ return R.error("宸ヤ綔妗ｆ暟鎹凡瀛樺湪,鏃犳硶鍒犻櫎锛侊紒");
+ }
+
}
return R.ok();
}
@@ -109,8 +148,8 @@
List<Map<String, Object>> result = new ArrayList<>();
for (WaitPakin waitPakin : page.getRecords()){
Map<String, Object> map = new HashMap<>();
- map.put("id", waitPakin.getId());
- map.put("value", waitPakin.getId());
+ map.put("id", waitPakin.getZpallet());
+ map.put("value", waitPakin.getZpallet());
result.add(map);
}
return R.ok(result);
--
Gitblit v1.9.1