From c65db22f67af8018ae7105ea00d8743e42835e13 Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期六, 29 三月 2025 15:52:09 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/controller/PackController.java | 36 +++++++++++++++++++++++++++++++++---
1 files changed, 33 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/PackController.java b/src/main/java/com/zy/asrs/controller/PackController.java
index d530b65..0a24b3f 100644
--- a/src/main/java/com/zy/asrs/controller/PackController.java
+++ b/src/main/java/com/zy/asrs/controller/PackController.java
@@ -9,10 +9,15 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
+import com.core.exception.CoolException;
+import com.zy.asrs.entity.Mat;
import com.zy.asrs.entity.Pack;
+import com.zy.asrs.service.MatService;
import com.zy.asrs.service.PackService;
+import com.zy.asrs.service.TagService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import java.util.*;
@@ -22,6 +27,10 @@
@Autowired
private PackService packService;
+ @Autowired
+ private MatService matService;
+ @Autowired
+ private TagService tagService;
@RequestMapping(value = "/pack/{id}/auth")
@ManagerAuth
@@ -40,7 +49,7 @@
excludeTrash(param);
convert(param, wrapper);
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} else {
- wrapper.orderBy("create_time", false);
+ wrapper.orderBy("settle").orderBy("create_time", false);
}
return R.ok(packService.selectPage(new Page<>(curr, limit), wrapper));
}
@@ -60,8 +69,29 @@
@RequestMapping(value = "/pack/add/auth")
@ManagerAuth
+ @Transactional
public R add(Pack pack) {
- packService.insert(pack);
+ String barcode = pack.getBarcode();
+ Date now = new Date();
+ pack.setStatus(1);
+ pack.setUpdateTime(now);
+ pack.setUpdateBy(getUserId());
+ pack.setCreateBy(getUserId());
+ pack.setCreateTime(now);
+ if (!packService.insert(pack)) {
+ throw new CoolException("鏁版嵁娣诲姞澶辫触");
+ }
+ Mat mat = new Mat();
+ mat.setTagId(tagService.getTop().getId());
+ mat.setMatnr(barcode);
+ mat.setMaktx(barcode);
+ mat.setStatus(1);
+ mat.setCreateTime(now);
+ mat.setUpdateTime(now);
+ mat.setMemo("鎵撳寘涓婄嚎");
+ if (!matService.insert(mat)) {
+ throw new CoolException("鎵撳寘涓婄嚎澶辫触");
+ }
return R.ok();
}
@@ -69,7 +99,7 @@
@ManagerAuth
public R update(Pack pack){
if (Cools.isEmpty(pack) || null==pack.getId()){
- return R.error();
+ return R.error("鍙傛暟缂哄け");
}
pack.setUpdateBy(getUserId());
pack.setUpdateTime(new Date());
--
Gitblit v1.9.1