From 6df368a849366e152cfecf1298631aafb56d0c00 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 19 四月 2022 16:00:56 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/PackServiceImpl.java | 19 +++++++++
src/main/java/com/zy/asrs/controller/OpenController.java | 1
src/main/java/com/zy/asrs/controller/PackController.java | 16 +++++---
src/main/java/com/zy/asrs/service/PackService.java | 2 +
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 32 ++++++++++++++--
src/main/java/com/zy/asrs/service/OpenService.java | 4 ++
6 files changed, 64 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index c358f57..6e6508c 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -46,6 +46,7 @@
if (Cools.isEmpty(barcode)) {
return R.parse(BaseRes.PARAM);
}
+ openService.packageUp(barcode);
return R.ok();
}
diff --git a/src/main/java/com/zy/asrs/controller/PackController.java b/src/main/java/com/zy/asrs/controller/PackController.java
index 32309b8..df89cc0 100644
--- a/src/main/java/com/zy/asrs/controller/PackController.java
+++ b/src/main/java/com/zy/asrs/controller/PackController.java
@@ -1,22 +1,24 @@
package com.zy.asrs.controller;
-import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
-import com.core.common.DateUtils;
-import com.zy.asrs.entity.Pack;
-import com.zy.asrs.service.PackService;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
+import com.core.common.DateUtils;
import com.core.common.R;
+import com.zy.asrs.entity.Pack;
+import com.zy.asrs.service.PackService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
@RestController
public class PackController extends BaseController {
@@ -40,7 +42,9 @@
EntityWrapper<Pack> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} else {
+ wrapper.orderBy("create_time", false);
+ }
return R.ok(packService.selectPage(new Page<>(curr, limit), wrapper));
}
diff --git a/src/main/java/com/zy/asrs/service/OpenService.java b/src/main/java/com/zy/asrs/service/OpenService.java
index df294c2..5ce5643 100644
--- a/src/main/java/com/zy/asrs/service/OpenService.java
+++ b/src/main/java/com/zy/asrs/service/OpenService.java
@@ -35,5 +35,9 @@
*/
List<StockVo> queryStock();
+ // ------------------------------------------
+
+ // 鎵撳寘涓婄嚎
+ void packageUp(String barcode);
}
diff --git a/src/main/java/com/zy/asrs/service/PackService.java b/src/main/java/com/zy/asrs/service/PackService.java
index 9251188..c7675f9 100644
--- a/src/main/java/com/zy/asrs/service/PackService.java
+++ b/src/main/java/com/zy/asrs/service/PackService.java
@@ -5,4 +5,6 @@
public interface PackService extends IService<Pack> {
+ Pack selectByBarcode(String barcode);
+
}
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 bc4b8f7..5a50fce 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -5,10 +5,7 @@
import com.core.common.DateUtils;
import com.core.common.SnowflakeIdWorker;
import com.core.exception.CoolException;
-import com.zy.asrs.entity.DocType;
-import com.zy.asrs.entity.Mat;
-import com.zy.asrs.entity.Order;
-import com.zy.asrs.entity.OrderDetl;
+import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.OpenOrderCompleteParam;
import com.zy.asrs.entity.param.OpenOrderPakinParam;
import com.zy.asrs.entity.param.OpenOrderPakoutParam;
@@ -44,6 +41,8 @@
private MatService matService;
@Autowired
private LocDetlService locDetlService;
+ @Autowired
+ private PackService packService;
@Override
@Transactional
@@ -311,4 +310,29 @@
return locDetlService.queryStockTotal();
}
+ @Override
+ public void packageUp(String barcode) {
+ Pack pack = packService.selectByBarcode(barcode);
+ if (null != pack) {
+ throw new CoolException(barcode + "閲嶅鎻愪氦");
+ }
+ Date now = new Date();
+ // todo:luxiaotao 瑙ｆ瀽鏉＄爜瑙勫垯锛岃幏鍙栫墿鏂欎唬鐮�
+ pack = new Pack(
+ barcode, // 鏉＄爜[闈炵┖]
+ null, // 鍟嗗搧缂栧彿
+ null, // 鎵瑰彿
+ 1L, // 璁㈠崟鐘舵��
+ 1, // 鐘舵��
+ now, // 娣诲姞鏃堕棿
+ null, // 娣诲姞浜哄憳
+ now, // 淇敼鏃堕棿
+ null, // 淇敼浜哄憳
+ null // 澶囨敞
+ );
+ if (!packService.insert(pack)) {
+ throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ }
+ }
+
}
diff --git a/src/main/java/com/zy/asrs/service/impl/PackServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/PackServiceImpl.java
index e0ddf18..04becc9 100644
--- a/src/main/java/com/zy/asrs/service/impl/PackServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/PackServiceImpl.java
@@ -1,12 +1,31 @@
package com.zy.asrs.service.impl;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.Cools;
import com.zy.asrs.mapper.PackMapper;
import com.zy.asrs.entity.Pack;
import com.zy.asrs.service.PackService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
+import java.util.List;
+
+@Slf4j
@Service("packService")
public class PackServiceImpl extends ServiceImpl<PackMapper, Pack> implements PackService {
+ @Override
+ public Pack selectByBarcode(String barcode) {
+ List<Pack> packs = this.selectList(new EntityWrapper<Pack>().eq("barcode", barcode));
+ if (Cools.isEmpty(packs)) {
+ return null;
+ } else {
+ if (packs.size() > 1) {
+ log.error("鎵撳寘涓婄嚎鏉＄爜閲嶅锛佹潯鐮侊細{}", barcode);
+ }
+ return packs.get(0);
+ }
+ }
+
}
--
Gitblit v1.9.1