From 45a5726fd6d86e034c1aebaef36063dfdb223311 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 22 四月 2022 23:25:50 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/PackController.java | 39 ++++++++++++++++++++++++++++++++++-----
1 files changed, 34 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/PackController.java b/src/main/java/com/zy/asrs/controller/PackController.java
index df89cc0..ef5ed9b 100644
--- a/src/main/java/com/zy/asrs/controller/PackController.java
+++ b/src/main/java/com/zy/asrs/controller/PackController.java
@@ -9,22 +9,28 @@
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.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
@RestController
public class PackController extends BaseController {
@Autowired
private PackService packService;
+ @Autowired
+ private MatService matService;
+ @Autowired
+ private TagService tagService;
@RequestMapping(value = "/pack/{id}/auth")
@ManagerAuth
@@ -63,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();
}
@@ -74,6 +101,8 @@
if (Cools.isEmpty(pack) || null==pack.getId()){
return R.error();
}
+ pack.setUpdateBy(getUserId());
+ pack.setUpdateTime(new Date());
packService.updateById(pack);
return R.ok();
}
--
Gitblit v1.9.1