From 55eb3d480594f4c0dd382eaeeb8548bf911d6ad7 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 23 十月 2025 08:28:08 +0800
Subject: [PATCH] 13
---
src/main/java/com/zy/asrs/controller/OrderPakinController.java | 125 ++--
src/main/java/com/zy/asrs/service/OrderReportService.java | 11
src/main/resources/mapper/OrderPakinMapper.xml | 2
src/main/java/com/zy/asrs/entity/OrderDetlPakin.java | 9
src/main/java/com/zy/asrs/controller/OrderDetlPakoutController.java | 11
src/main/java/com/zy/common/web/WcsController.java | 8
src/main/java/com/zy/asrs/service/OpenService.java | 5
src/main/java/com/zy/asrs/controller/WaitPakinController.java | 7
src/main/java/com/zy/asrs/mapper/OrderReportMapper.java | 17
src/main/java/com/zy/asrs/entity/OrderReportLog.java | 471 +++++++++++++++
src/main/java/com/zy/asrs/task/handler/OrderMoveHistoryHandler.java | 86 ++
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 32
src/main/java/com/zy/asrs/mapper/OrderPakinMapper.java | 2
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 30
src/main/java/com/zy/asrs/controller/MatController.java | 3
src/main/resources/mapper/OrderPakoutMapper.xml | 2
src/main/java/com/zy/asrs/controller/OutController.java | 22
src/main/java/com/zy/asrs/service/impl/OrderReportServiceImpl.java | 31 +
src/main/java/com/zy/asrs/entity/param/OrderPakoutDomainParam.java | 4
src/main/java/com/zy/asrs/entity/OrderDetlPakout.java | 11
src/main/java/com/zy/asrs/entity/param/OrderPakinDomainParam.java | 5
src/main/java/com/zy/asrs/service/impl/OrderDetlPakinServiceImpl.java | 34
src/main/java/com/zy/asrs/service/OrderDetlPakoutService.java | 2
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 146 ----
src/main/java/com/zy/asrs/controller/OpenController.java | 23
src/main/java/com/zy/asrs/mapper/OrderDetlPakinMapper.java | 14
src/main/java/com/zy/asrs/mapper/OrderDetlPakoutMapper.java | 2
src/main/java/com/zy/asrs/task/AutoLocMoveScheduler.java | 25
src/main/java/com/zy/asrs/task/OrderMoveHistoryScheduler.java | 10
src/main/java/com/zy/asrs/mapper/OrderPakoutMapper.java | 29
src/main/java/com/zy/asrs/task/OrderSyncScheduler.java | 13
src/main/java/com/zy/asrs/controller/MobileController.java | 62 -
src/main/java/com/zy/asrs/service/impl/OrderPakinServiceImpl.java | 50
src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java | 7
src/main/resources/mapper/OrderDetlPakinMapper.xml | 2
src/main/java/com/zy/asrs/controller/OrderPakoutController.java | 83 +-
src/main/java/com/zy/asrs/service/OrderPakinService.java | 9
src/main/java/com/zy/asrs/service/OrderDetlPakinService.java | 43 +
src/main/java/com/zy/asrs/service/impl/OrderPakoutServiceImpl.java | 46
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 13
src/main/resources/mapper/OrderDetlPakoutMapper.xml | 2
src/main/java/com/zy/asrs/controller/OrderDetlPakinController.java | 53
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 146 +--
src/main/java/com/zy/asrs/service/impl/OrderDetlPakoutServiceImpl.java | 10
src/main/java/com/zy/asrs/service/OrderPakoutService.java | 34 +
45 files changed, 1,121 insertions(+), 631 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MatController.java b/src/main/java/com/zy/asrs/controller/MatController.java
index bd09394..296ecc7 100644
--- a/src/main/java/com/zy/asrs/controller/MatController.java
+++ b/src/main/java/com/zy/asrs/controller/MatController.java
@@ -16,7 +16,6 @@
import com.zy.asrs.entity.result.KeyValueVo;
import com.zy.asrs.service.MatService;
import com.zy.asrs.service.MobileService;
-import com.zy.asrs.service.OrderDetlService;
import com.zy.asrs.utils.MatExcelListener;
import com.zy.common.CodeRes;
import com.zy.common.config.AdminInterceptor;
@@ -43,8 +42,6 @@
@Autowired
private MatService matService;
- @Autowired
- private OrderDetlService orderDetlService;
@Autowired
private MobileService mobileService;
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 5b3b2ab..f3a4615 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -44,9 +44,14 @@
@Autowired
private LocDetlService locDetlService;
@Autowired
- private OrderService orderService;
+ private OrderPakoutService orderPakoutService;
@Autowired
- private OrderDetlService orderDetlService;
+ private OrderPakinService orderPakinService;
+ @Autowired
+ private OrderDetlPakoutService orderDetlPakoutService;
+
+ @Autowired
+ private OrderDetlPakinService orderDetlPakinService;
@Autowired
private DocTypeService docTypeService;
@Autowired
@@ -61,13 +66,7 @@
private CommonService commonService;
-// @PostMapping("/agv/start")
-// @ManagerAuth
-// public R pdaStockCheck(@RequestBody StockCheckParam param){
-//
-//
-//
-// }
+
@PostMapping("/agv/start")
@@ -79,16 +78,6 @@
} else if (Cools.isEmpty(map.get("inSta"))) {
return R.parse("鍏ュ簱绔欑偣涓嶈兘涓虹┖");
}
-// HashMap<String, String> map1 = new HashMap<>();
-// map1.put("agv0001","sta0001");
-// String sta = map.get("sta").toString();
-//
-// ForwardAGVTaskParam forwardAGVTaskParam = new ForwardAGVTaskParam();
-// getAgvTaskParam(forwardAGVTaskParam,sta,map1.get(sta));
-// String request = forwardAGVHttpRequest(forwardAGVTaskParam, "10.0.100.110:8182", "/rcms/services/rest/hikRpcService/genAgvSchedulingTask");
-// if ("SUCCESS".equals(request)) {
-// return R.ok();
-// }
String sta = (String) map.get("sta"); // 鏆傚瓨浣�
String inSta = String.valueOf(map.get("inSta")); // 鍏ュ簱绔欑偣
@@ -187,39 +176,14 @@
}
- // 缁勬墭 ----------------------------------------------------------------------------------------------------
- /**
- * 鏍规嵁鍗曞彿妫�绱㈠崟鎹暟鎹�
- * http://localhost:8081/jkwms/mobile/order/serach/orderNo/auth?orderNo=123123
- */
-// @RequestMapping("/order/search/orderNo/auth")
-// @ManagerAuth
-// public R orderSearchByBarcode(@RequestParam String orderNo){
-// Order order = orderService.selectByNo(orderNo);
-// if (order == null) {
-// return R.ok();
-// }
-// DocType docType = docTypeService.selectById(order.getDocType());
-// if (docType.getPakin() == null || docType.getPakin() != 1) {
-// return R.ok();
-// }
-// if (order.getSettle() > 2) {
-// return R.ok();
-// }
-// List<OrderDetl> orderDetls = orderService.selectWorkingDetls(order.getId());
-// if (Cools.isEmpty(orderDetls)) {
-// return R.ok();
-// }
-// return R.ok().add(orderDetls);
-// }
@RequestMapping("/order/search/orderNo/auth")
@ManagerAuth
public R orderSearchByBarcode(@RequestParam String orderNo) {
if (Cools.isEmpty(orderNo)) {
orderNo = null;
}
- List<OrderPakin> orders = orderService.selectorderNoL(orderNo);
+ List<OrderPakin> orders = orderPakinService.selectorderNoL(orderNo);
if (Cools.isEmpty(orders)) {
return R.ok();
}
@@ -237,10 +201,10 @@
if (order.getSettle() > 2) {
continue;
}
- List<OrderDetlPakout> orderDetlPakouts = orderService.selectWorkingDetls(order.getId());
+ List<OrderDetlPakin> orderDetlPakouts = orderPakinService.selectWorkingDetls(order.getId());
if (!Cools.isEmpty(orderDetlPakouts)) {
LinkedList<CombParam.CombMat> combMats = new LinkedList<>();
- for (OrderDetlPakout orderDetlPakout : orderDetlPakouts) {
+ for (OrderDetlPakin orderDetlPakout : orderDetlPakouts) {
CombParam.CombMat combMat = new CombParam.CombMat();
combMat.setMatnr(orderDetlPakout.getMatnr());
combMat.setBatch(orderDetlPakout.getBatch());
@@ -342,7 +306,7 @@
return R.ok();
}
// List<Order> orders = orderService.selectorderNoL(batch);
- OrderDetlPakout orderDetlPakout = orderDetlService.selectOne(new EntityWrapper<OrderDetlPakout>().eq("matnr", combParam.getMatnr()).eq("batch", combParam.getBatch()).eq("order_no", combParam.getOrderNo()));
+ OrderDetlPakout orderDetlPakout = orderDetlPakoutService.selectOne(new EntityWrapper<OrderDetlPakout>().eq("matnr", combParam.getMatnr()).eq("batch", combParam.getBatch()).eq("order_no", combParam.getOrderNo()));
if (Cools.isEmpty(orderDetlPakout)) {
return R.error("鏈煡鍒版暟鎹�");
}
@@ -351,7 +315,7 @@
}
//澶嶆牳鏁�
orderDetlPakout.setSource(1);
- orderDetlService.updateById(orderDetlPakout);
+ orderDetlPakoutService.updateById(orderDetlPakout);
return R.ok();
}
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 74aa83b..77292c6 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -40,20 +40,33 @@
@Autowired
private WrkMastService wrkMastService;
- @GetMapping("/order/delete/v1")
+ @GetMapping("/pakout/order/delete/v1")
@AppAuth(memo = "璁㈠崟淇℃伅鍒犻櫎")
- public synchronized R orderDelete(@RequestHeader(required = false) String appkey,
- @RequestParam String orderNo,
- HttpServletRequest request) {
+ public synchronized R orderPakinDelete(@RequestHeader(required = false) String appkey,
+ @RequestParam String orderNo,
+ HttpServletRequest request) {
auth(appkey, orderNo, request);
if (Cools.isEmpty(orderNo)) {
return R.parse(BaseRes.PARAM);
}
- openService.orderDelete(orderNo);
+ openService.orderPakinDelete(orderNo);
return R.ok();
}
+ @GetMapping("/pakin/order/delete/v1")
+ @AppAuth(memo = "鍏ュ簱璁㈠崟淇℃伅鍒犻櫎")
+ public synchronized R orderPakoutDelete(@RequestHeader(required = false) String appkey,
+ @RequestParam String orderNo,
+ HttpServletRequest request) {
+ auth(appkey, orderNo, request);
+ if (Cools.isEmpty(orderNo)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ openService.orderPakoutDelete(orderNo);
+ return R.ok();
+
+ }
@PostMapping("/tagSync/v1")
@AppAuth(memo = "鐗╂枡鍒嗙被鍚屾")
diff --git a/src/main/java/com/zy/asrs/controller/OrderDetlController.java b/src/main/java/com/zy/asrs/controller/OrderDetlPakinController.java
similarity index 74%
copy from src/main/java/com/zy/asrs/controller/OrderDetlController.java
copy to src/main/java/com/zy/asrs/controller/OrderDetlPakinController.java
index d6b8dfb..527d606 100644
--- a/src/main/java/com/zy/asrs/controller/OrderDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderDetlPakinController.java
@@ -9,9 +9,9 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
-import com.zy.asrs.entity.OrderDetlPakout;
-import com.zy.asrs.mapper.OrderDetlMapper;
-import com.zy.asrs.service.OrderDetlService;
+import com.zy.asrs.entity.OrderDetlPakin;
+import com.zy.asrs.mapper.OrderDetlPakinMapper;
+import com.zy.asrs.service.OrderDetlPakinService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -23,18 +23,19 @@
import java.util.Map;
@RestController
-public class OrderDetlController extends BaseController {
+@RequestMapping(value = "/pakin")
+public class OrderDetlPakinController extends BaseController {
@Autowired
- private OrderDetlService orderDetlService;
+ private OrderDetlPakinService orderDetlService;
@Resource
- private OrderDetlMapper orderDetlMapper;
+ private OrderDetlPakinMapper orderDetlMapper;
@RequestMapping(value = "/orderDetl/search/pda/auth")
@ManagerAuth
public R pdaOrderDetlSearch(@RequestParam(required = false) String condition, @RequestParam(required = false) String order) {
- EntityWrapper<OrderDetlPakout> wrapper = new EntityWrapper<>();
+ EntityWrapper<OrderDetlPakin> wrapper = new EntityWrapper<>();
if (!Cools.isEmpty(condition)) {
// wrapper.like("matnr", condition).or().like("maktx", condition);
@@ -42,13 +43,13 @@
}
wrapper.eq("order_no", order);
wrapper.orderBy("create_time", false);
- List<OrderDetlPakout> mats = orderDetlService.selectList(wrapper);
+ List<OrderDetlPakin> mats = orderDetlService.selectList(wrapper);
return R.ok().add(mats);
}
@PostMapping("/orderDetl/list/pda/auth")
public R getPdaOrderDetl(@RequestBody Map<String, Object> map) {
- EntityWrapper<OrderDetlPakout> wrapper = new EntityWrapper<>();
+ EntityWrapper<OrderDetlPakin> wrapper = new EntityWrapper<>();
wrapper.eq("order_no", map.get("orderNo"));
return R.ok(orderDetlService.selectList(wrapper));
}
@@ -66,7 +67,7 @@
@RequestParam(required = false) String orderByField,
@RequestParam(required = false) String orderByType,
@RequestParam Map<String, Object> param) {
- EntityWrapper<OrderDetlPakout> wrapper = new EntityWrapper<>();
+ EntityWrapper<OrderDetlPakin> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
if (!Cools.isEmpty(orderByField)) {
@@ -75,7 +76,7 @@
wrapper.orderBy("create_time", false);
}
wrapper.eq("status", 1);
- Page<OrderDetlPakout> orderDetlPage = orderDetlService.selectPage(new Page<>(curr, limit), wrapper);
+ Page<OrderDetlPakin> orderDetlPage = orderDetlService.selectPage(new Page<>(curr, limit), wrapper);
return R.ok(orderDetlPage);
}
@@ -84,7 +85,7 @@
public R pakoutList(@RequestParam(defaultValue = "1") Integer curr,
@RequestParam(defaultValue = "10") Integer limit,
@RequestParam Map<String, Object> param) {
- return R.ok(orderDetlService.getPakoutPage(toPage(curr, limit, param, OrderDetlPakout.class)));
+ return R.ok(orderDetlService.getPakoutPage(toPage(curr, limit, param, OrderDetlPakin.class)));
}
private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
@@ -102,18 +103,18 @@
@RequestMapping(value = "/orderDetl/add/auth")
@ManagerAuth
- public R add(OrderDetlPakout orderDetlPakout) {
- orderDetlService.insert(orderDetlPakout);
+ public R add(OrderDetlPakin OrderDetlPakin) {
+ orderDetlService.insert(OrderDetlPakin);
return R.ok();
}
@RequestMapping(value = "/orderDetl/update/auth")
@ManagerAuth
- public R update(OrderDetlPakout orderDetlPakout) {
- if (Cools.isEmpty(orderDetlPakout) || null == orderDetlPakout.getId()) {
+ public R update(OrderDetlPakin OrderDetlPakin) {
+ if (Cools.isEmpty(OrderDetlPakin) || null == OrderDetlPakin.getId()) {
return R.error();
}
- orderDetlService.updateById(orderDetlPakout);
+ orderDetlService.updateById(OrderDetlPakin);
return R.ok();
}
@@ -129,25 +130,25 @@
@RequestMapping(value = "/orderDetl/export/auth")
@ManagerAuth
public R export(@RequestBody JSONObject param) {
- EntityWrapper<OrderDetlPakout> wrapper = new EntityWrapper<>();
+ EntityWrapper<OrderDetlPakin> wrapper = new EntityWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("orderDetl"));
convert(map, wrapper);
- List<OrderDetlPakout> list = orderDetlService.selectList(wrapper);
+ List<OrderDetlPakin> list = orderDetlService.selectList(wrapper);
return R.ok(exportSupport(list, fields));
}
@RequestMapping(value = "/orderDetlQuery/auth")
@ManagerAuth
public R query(String condition) {
- EntityWrapper<OrderDetlPakout> wrapper = new EntityWrapper<>();
+ EntityWrapper<OrderDetlPakin> wrapper = new EntityWrapper<>();
wrapper.like("id", condition);
- Page<OrderDetlPakout> page = orderDetlService.selectPage(new Page<>(0, 10), wrapper);
+ Page<OrderDetlPakin> page = orderDetlService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (OrderDetlPakout orderDetlPakout : page.getRecords()) {
+ for (OrderDetlPakin OrderDetlPakin : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
- map.put("id", orderDetlPakout.getId());
- map.put("value", orderDetlPakout.getId());
+ map.put("id", OrderDetlPakin.getId());
+ map.put("value", OrderDetlPakin.getId());
result.add(map);
}
return R.ok(result);
@@ -156,9 +157,9 @@
@RequestMapping(value = "/orderDetl/check/column/auth")
@ManagerAuth
public R query(@RequestBody JSONObject param) {
- Wrapper<OrderDetlPakout> wrapper = new EntityWrapper<OrderDetlPakout>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ Wrapper<OrderDetlPakin> wrapper = new EntityWrapper<OrderDetlPakin>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
if (null != orderDetlService.selectOne(wrapper)) {
- return R.parse(BaseRes.REPEAT).add(getComment(OrderDetlPakout.class, String.valueOf(param.get("key"))));
+ return R.parse(BaseRes.REPEAT).add(getComment(OrderDetlPakin.class, String.valueOf(param.get("key"))));
}
return R.ok();
}
diff --git a/src/main/java/com/zy/asrs/controller/OrderDetlController.java b/src/main/java/com/zy/asrs/controller/OrderDetlPakoutController.java
similarity index 95%
rename from src/main/java/com/zy/asrs/controller/OrderDetlController.java
rename to src/main/java/com/zy/asrs/controller/OrderDetlPakoutController.java
index d6b8dfb..e5ef6cf 100644
--- a/src/main/java/com/zy/asrs/controller/OrderDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderDetlPakoutController.java
@@ -10,8 +10,8 @@
import com.core.common.DateUtils;
import com.core.common.R;
import com.zy.asrs.entity.OrderDetlPakout;
-import com.zy.asrs.mapper.OrderDetlMapper;
-import com.zy.asrs.service.OrderDetlService;
+import com.zy.asrs.mapper.OrderDetlPakoutMapper;
+import com.zy.asrs.service.OrderDetlPakoutService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -23,13 +23,14 @@
import java.util.Map;
@RestController
-public class OrderDetlController extends BaseController {
+@RequestMapping(value = "/pakout")
+public class OrderDetlPakoutController extends BaseController {
@Autowired
- private OrderDetlService orderDetlService;
+ private OrderDetlPakoutService orderDetlService;
@Resource
- private OrderDetlMapper orderDetlMapper;
+ private OrderDetlPakoutMapper orderDetlMapper;
@RequestMapping(value = "/orderDetl/search/pda/auth")
@ManagerAuth
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderPakinController.java
similarity index 78%
copy from src/main/java/com/zy/asrs/controller/OrderController.java
copy to src/main/java/com/zy/asrs/controller/OrderPakinController.java
index 870074b..b9c250c 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderPakinController.java
@@ -8,7 +8,7 @@
import com.core.common.*;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
-import com.zy.asrs.entity.param.OrderDomainParam;
+import com.zy.asrs.entity.param.OrderPakinDomainParam;
import com.zy.asrs.entity.result.WrkTraceVo;
import com.zy.asrs.service.*;
import com.zy.common.model.DetlDto;
@@ -21,12 +21,13 @@
import java.util.*;
@RestController
-public class OrderController extends BaseController {
+@RequestMapping(value = "/pakin")
+public class OrderPakinController extends BaseController {
@Autowired
- private OrderService orderService;
+ private OrderPakinService orderPakinService;
@Autowired
- private OrderDetlService orderDetlService;
+ private OrderDetlPakinService orderDetlPakinService;
@Autowired
private SnowflakeIdWorker snowflakeIdWorker;
@Autowired
@@ -51,7 +52,7 @@
wrapper.like("order_no", condition);
}
wrapper.orderBy("create_time", false);
- List<OrderPakin> mats = orderService.selectList(wrapper);
+ List<OrderPakin> mats = orderPakinService.selectList(wrapper);
return R.ok().add(mats);
}
@@ -71,7 +72,7 @@
wrapper.in("doc_type", arrayList);
wrapper.in("settle", 1, 2);
wrapper.orderBy("create_time", false);
- Page<OrderPakin> orderPage = orderService.selectPage(new Page<>(curr, limit), wrapper);
+ Page<OrderPakin> orderPage = orderPakinService.selectPage(new Page<>(curr, limit), wrapper);
return R.ok().add(orderPage);
}
@@ -90,7 +91,7 @@
wrapper.in("doc_type", arrayList);
wrapper.in("settle", 1, 2);
wrapper.orderBy("create_time", false);
- Page<OrderPakin> orderPage = orderService.selectPage(new Page<>(curr, limit), wrapper);
+ Page<OrderPakin> orderPage = orderPakinService.selectPage(new Page<>(curr, limit), wrapper);
return R.ok().add(orderPage);
}
@@ -103,7 +104,7 @@
}
wrapper.le("settle", 2).eq("status", 1);
wrapper.orderBy("create_time", false);
- List<OrderPakin> orders = orderService.selectList(wrapper);
+ List<OrderPakin> orders = orderPakinService.selectList(wrapper);
// 淇濈暀鍑哄簱鍗�
if (!Cools.isEmpty(orders)) {
Iterator<OrderPakin> iterator = orders.iterator();
@@ -138,19 +139,19 @@
wrapper.orderBy("settle").orderBy("create_time", false);
}
wrapper.eq("status", 1);
- return R.ok(orderService.selectPage(new Page<>(curr, limit), wrapper));
+ return R.ok(orderPakinService.selectPage(new Page<>(curr, limit), wrapper));
}
@RequestMapping(value = "/order/detl/all/auth")
@ManagerAuth
public R head(@RequestParam Long orderId) {
- return R.ok().add(orderDetlService.selectList(new EntityWrapper<OrderDetlPakout>().eq("order_id", orderId)));
+ return R.ok().add(orderDetlPakinService.selectList(new EntityWrapper<OrderDetlPakin>().eq("order_id", orderId)));
}
@RequestMapping(value = "/order/form/add/auth")
@ManagerAuth(memo = "鎵嬪姩娣诲姞璁㈠崟")
@Transactional
- public R formAdd(@RequestBody OrderDomainParam param) {
+ public R formAdd(@RequestBody OrderPakinDomainParam param) {
if (Cools.isEmpty(param.getOrderNo())) {
String prefix = "";
DocType docType = docTypeService.selectById(param.getDocType());
@@ -159,7 +160,7 @@
}
param.setOrderNo(prefix + snowflakeIdWorker.nextId());
}
- OrderPakin order = orderService.selectByNo(param.getOrderNo());
+ OrderPakin order = orderPakinService.selectByNo(param.getOrderNo());
if (order != null) {
return R.error("鍗曟嵁缂栧彿宸插瓨鍦�");
}
@@ -200,29 +201,29 @@
now, // 淇敼鏃堕棿
null // 澶囨敞
);
- if (!orderService.insert(order)) {
+ if (!orderPakinService.insert(order)) {
throw new CoolException("淇濆瓨璁㈠崟涓绘。澶辫触");
}
List<DetlDto> list = new ArrayList<>();
- for (OrderDetlPakout orderDetlPakout : param.getOrderDetlPakoutList()) {
- DetlDto dto = new DetlDto(orderDetlPakout.getMatnr(), orderDetlPakout.getBatch());
+ for (OrderDetlPakin OrderDetlPakin : param.getOrderDetlList()) {
+ DetlDto dto = new DetlDto(OrderDetlPakin.getMatnr(), OrderDetlPakin.getBatch());
if (DetlDto.has(list, dto)) {
- OrderDetlPakout item = orderDetlService.selectItem(order.getId(), orderDetlPakout.getMatnr(), orderDetlPakout.getBatch());
- item.setAnfme(item.getAnfme() + orderDetlPakout.getAnfme());
- if (!orderDetlService.updateById(item)) {
+ OrderDetlPakin item = orderDetlPakinService.selectItem(order.getId(), OrderDetlPakin.getMatnr(), OrderDetlPakin.getBatch());
+ item.setAnfme(item.getAnfme() + OrderDetlPakin.getAnfme());
+ if (!orderDetlPakinService.updateById(item)) {
throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�");
}
} else {
list.add(dto);
- orderDetlPakout.setOrderId(order.getId());
- orderDetlPakout.setOrderNo(order.getOrderNo());
- orderDetlPakout.setCreateBy(getUserId());
- orderDetlPakout.setCreateTime(now);
- orderDetlPakout.setUpdateBy(getUserId());
- orderDetlPakout.setUpdateTime(now);
- orderDetlPakout.setStatus(1);
- orderDetlPakout.setQty(0.0D);
- if (!orderDetlService.insert(orderDetlPakout)) {
+ OrderDetlPakin.setOrderId(order.getId());
+ OrderDetlPakin.setOrderNo(order.getOrderNo());
+ OrderDetlPakin.setCreateBy(getUserId());
+ OrderDetlPakin.setCreateTime(now);
+ OrderDetlPakin.setUpdateBy(getUserId());
+ OrderDetlPakin.setUpdateTime(now);
+ OrderDetlPakin.setStatus(1);
+ OrderDetlPakin.setQty(0.0D);
+ if (!orderDetlPakinService.insert(OrderDetlPakin)) {
throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�");
}
}
@@ -233,8 +234,8 @@
@RequestMapping(value = "/order/form/modify/auth")
@ManagerAuth(memo = "鎵嬪姩淇敼璁㈠崟")
@Transactional
- public R formModify(@RequestBody OrderDomainParam param) {
- OrderPakin order = orderService.selectById(param.getOrderId());
+ public R formModify(@RequestBody OrderPakinDomainParam param) {
+ OrderPakin order = orderPakinService.selectById(param.getOrderId());
if (order == null || order.getStatus() == 0) {
return R.error("璁㈠崟涓嶅瓨鍦�");
}
@@ -245,37 +246,37 @@
order.setDocType(param.getDocType());
order.setUpdateBy(userId);
order.setUpdateTime(now);
- if (!orderService.updateById(order)) {
+ if (!orderPakinService.updateById(order)) {
throw new CoolException("淇敼璁㈠崟绫诲瀷澶辫触");
}
}
// 淇敼鏄庣粏妗�
// List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
// 1.娓呯┖鏄庣粏妗�
- if (!orderDetlService.delete(new EntityWrapper<OrderDetlPakout>().eq("order_id", order.getId()))) {
+ if (!orderDetlPakinService.delete(new EntityWrapper<OrderDetlPakin>().eq("order_id", order.getId()))) {
throw new CoolException("娓呯┖璁㈠崟鏄庣粏澶辫触");
}
// 2.閲嶇粍鏁版嵁
List<DetlDto> list = new ArrayList<>();
- for (OrderDetlPakout orderDetlPakout : param.getOrderDetlPakoutList()) {
- DetlDto dto = new DetlDto(orderDetlPakout.getMatnr(), orderDetlPakout.getBatch());
+ for (OrderDetlPakin OrderDetlPakin : param.getOrderDetlList()) {
+ DetlDto dto = new DetlDto(OrderDetlPakin.getMatnr(), OrderDetlPakin.getBatch());
if (DetlDto.has(list, dto)) {
- OrderDetlPakout item = orderDetlService.selectItem(order.getId(), orderDetlPakout.getMatnr(), orderDetlPakout.getBatch());
- item.setAnfme(item.getAnfme() + orderDetlPakout.getAnfme());
- if (!orderDetlService.updateById(item)) {
+ OrderDetlPakin item = orderDetlPakinService.selectItem(order.getId(), OrderDetlPakin.getMatnr(), OrderDetlPakin.getBatch());
+ item.setAnfme(item.getAnfme() + OrderDetlPakin.getAnfme());
+ if (!orderDetlPakinService.updateById(item)) {
throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�");
}
} else {
list.add(dto);
- orderDetlPakout.setOrderId(order.getId());
- orderDetlPakout.setOrderNo(order.getOrderNo());
- orderDetlPakout.setCreateBy(getUserId());
- orderDetlPakout.setCreateTime(now);
- orderDetlPakout.setUpdateBy(getUserId());
- orderDetlPakout.setUpdateTime(now);
- orderDetlPakout.setStatus(1);
- orderDetlPakout.setQty(0.0D);
- if (!orderDetlService.insert(orderDetlPakout)) {
+ OrderDetlPakin.setOrderId(order.getId());
+ OrderDetlPakin.setOrderNo(order.getOrderNo());
+ OrderDetlPakin.setCreateBy(getUserId());
+ OrderDetlPakin.setCreateTime(now);
+ OrderDetlPakin.setUpdateBy(getUserId());
+ OrderDetlPakin.setUpdateTime(now);
+ OrderDetlPakin.setStatus(1);
+ OrderDetlPakin.setQty(0.0D);
+ if (!orderDetlPakinService.insert(OrderDetlPakin)) {
throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�");
}
}
@@ -286,23 +287,23 @@
@PostMapping(value = "/order/wrk/trace/auth")
@ManagerAuth
public R orderWrkTrace(@RequestParam("orderId") Long orderId) {
- OrderPakin order = orderService.selectById(orderId);
+ OrderPakin order = orderPakinService.selectById(orderId);
if (null == order) {
return R.error("鍗曟嵁涓嶅瓨鍦�");
}
// 鏁伴噺缁熻
- List<OrderDetlPakout> orderDetlPakouts = orderDetlService.selectByOrderId(orderId);
+ List<OrderDetlPakin> OrderDetlPakins = orderDetlPakinService.selectByOrderId(orderId);
double totalQty = 0;
double wrkQty = 0;
double lackQty = 0;
double endQty = 0;
- for (OrderDetlPakout orderDetlPakout : orderDetlPakouts) {
- totalQty = totalQty + orderDetlPakout.getAnfme();
- wrkQty = wrkQty + orderDetlPakout.getWorkQty();
- endQty = endQty + orderDetlPakout.getQty();
- double issued = Optional.of(orderDetlPakout.getAnfme() - orderDetlPakout.getWorkQty()).orElse(0.0D);
+ for (OrderDetlPakin OrderDetlPakin : OrderDetlPakins) {
+ totalQty = totalQty + OrderDetlPakin.getAnfme();
+ wrkQty = wrkQty + OrderDetlPakin.getWorkQty();
+ endQty = endQty + OrderDetlPakin.getQty();
+ double issued = Optional.of(OrderDetlPakin.getAnfme() - OrderDetlPakin.getWorkQty()).orElse(0.0D);
if (issued > 0.0) {
- List<LocDetl> locDetls = locDetlService.queryStock(orderDetlPakout.getMatnr(), orderDetlPakout.getBatch(), orderDetlPakout.getOrigin(), null, null, null, null);
+ List<LocDetl> locDetls = locDetlService.queryStock(OrderDetlPakin.getMatnr(), OrderDetlPakin.getBatch(), OrderDetlPakin.getOrigin(), null, null, null, null);
for (LocDetl locDetl : locDetls) {
if (issued > 0) {
issued = issued - locDetl.getAnfme();
@@ -363,7 +364,7 @@
@RequestMapping(value = "/order/{id}/auth")
@ManagerAuth
public R get(@PathVariable("id") String id) {
- return R.ok(orderService.selectById(String.valueOf(id)));
+ return R.ok(orderPakinService.selectById(String.valueOf(id)));
}
@RequestMapping(value = "/order/list/auth")
@@ -379,7 +380,7 @@
if (!Cools.isEmpty(orderByField)) {
wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
}
- return R.ok(orderService.selectPage(new Page<>(curr, limit), wrapper));
+ return R.ok(orderPakinService.selectPage(new Page<>(curr, limit), wrapper));
}
private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
@@ -413,7 +414,7 @@
order.setUpdateBy(getUserId());
order.setUpdateTime(new Date());
- if (!orderService.updateById(order)) {
+ if (!orderPakinService.updateById(order)) {
throw new CoolException("淇敼璁㈠崟澶辫触");
}
return R.ok();
@@ -423,12 +424,12 @@
@ManagerAuth(memo = "鎵嬪姩鍒犻櫎璁㈠崟")
@Transactional
public R delete(@RequestParam Long orderId) {
- orderService.remove(orderId);
-// Order order = orderService.selectById(orderId);
+ orderPakinService.remove(orderId);
+// Order order = orderPakinService.selectById(orderId);
// if (order != null) {
// order.setStatus(0);
// }
-// if (!orderService.updateById(order)) {
+// if (!orderPakinService.updateById(order)) {
// throw new CoolException("鍒犻櫎璁㈠崟澶辫触");
// }
// orderDetlService.modifyStatus(orderId, 0);
@@ -442,7 +443,7 @@
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("order"));
convert(map, wrapper);
- List<OrderPakin> list = orderService.selectList(wrapper);
+ List<OrderPakin> list = orderPakinService.selectList(wrapper);
return R.ok(exportSupport(list, fields));
}
@@ -451,7 +452,7 @@
public R query(String condition) {
EntityWrapper<OrderPakin> wrapper = new EntityWrapper<>();
wrapper.like("id", condition);
- Page<OrderPakin> page = orderService.selectPage(new Page<>(0, 10), wrapper);
+ Page<OrderPakin> page = orderPakinService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (OrderPakin order : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
@@ -466,7 +467,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<OrderPakin> wrapper = new EntityWrapper<OrderPakin>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != orderService.selectOne(wrapper)) {
+ if (null != orderPakinService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(OrderPakin.class, String.valueOf(param.get("key"))));
}
return R.ok();
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderPakoutController.java
similarity index 85%
rename from src/main/java/com/zy/asrs/controller/OrderController.java
rename to src/main/java/com/zy/asrs/controller/OrderPakoutController.java
index 870074b..1263b93 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderPakoutController.java
@@ -8,7 +8,7 @@
import com.core.common.*;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
-import com.zy.asrs.entity.param.OrderDomainParam;
+import com.zy.asrs.entity.param.OrderPakoutDomainParam;
import com.zy.asrs.entity.result.WrkTraceVo;
import com.zy.asrs.service.*;
import com.zy.common.model.DetlDto;
@@ -21,12 +21,13 @@
import java.util.*;
@RestController
-public class OrderController extends BaseController {
+@RequestMapping(value = "/pakout")
+public class OrderPakoutController extends BaseController {
@Autowired
- private OrderService orderService;
+ private OrderPakoutService orderService;
@Autowired
- private OrderDetlService orderDetlService;
+ private OrderDetlPakoutService orderDetlPakoutService;
@Autowired
private SnowflakeIdWorker snowflakeIdWorker;
@Autowired
@@ -45,13 +46,13 @@
@RequestMapping(value = "/order/search/pda/auth")
@ManagerAuth
public R pdaOrderSearch(@RequestParam(required = false) String condition) {
- EntityWrapper<OrderPakin> wrapper = new EntityWrapper<>();
+ EntityWrapper<OrderPakout> wrapper = new EntityWrapper<>();
if (!Cools.isEmpty(condition)) {
// wrapper.like("matnr", condition).or().like("maktx", condition);
wrapper.like("order_no", condition);
}
wrapper.orderBy("create_time", false);
- List<OrderPakin> mats = orderService.selectList(wrapper);
+ List<OrderPakout> mats = orderService.selectList(wrapper);
return R.ok().add(mats);
}
@@ -66,12 +67,12 @@
docTypes.forEach(docType -> {
arrayList.add(docType.getDocId().intValue());
});
- EntityWrapper<OrderPakin> wrapper = new EntityWrapper<>();
+ EntityWrapper<OrderPakout> wrapper = new EntityWrapper<>();
// wrapper.eq("tag_id", tagId);
wrapper.in("doc_type", arrayList);
wrapper.in("settle", 1, 2);
wrapper.orderBy("create_time", false);
- Page<OrderPakin> orderPage = orderService.selectPage(new Page<>(curr, limit), wrapper);
+ Page<OrderPakout> orderPage = orderService.selectPage(new Page<>(curr, limit), wrapper);
return R.ok().add(orderPage);
}
@@ -85,30 +86,30 @@
docTypes.forEach(docType -> {
arrayList.add(docType.getDocId().intValue());
});
- EntityWrapper<OrderPakin> wrapper = new EntityWrapper<>();
+ EntityWrapper<OrderPakout> wrapper = new EntityWrapper<>();
// wrapper.eq("tag_id", tagId);
wrapper.in("doc_type", arrayList);
wrapper.in("settle", 1, 2);
wrapper.orderBy("create_time", false);
- Page<OrderPakin> orderPage = orderService.selectPage(new Page<>(curr, limit), wrapper);
+ Page<OrderPakout> orderPage = orderService.selectPage(new Page<>(curr, limit), wrapper);
return R.ok().add(orderPage);
}
@RequestMapping(value = "/order/nav/list/auth")
@ManagerAuth
public R navList(@RequestParam(required = false) String orderNo) {
- EntityWrapper<OrderPakin> wrapper = new EntityWrapper<>();
+ EntityWrapper<OrderPakout> wrapper = new EntityWrapper<>();
if (!Cools.isEmpty(orderNo)) {
wrapper.like("order_no", orderNo);
}
wrapper.le("settle", 2).eq("status", 1);
wrapper.orderBy("create_time", false);
- List<OrderPakin> orders = orderService.selectList(wrapper);
+ List<OrderPakout> orders = orderService.selectList(wrapper);
// 淇濈暀鍑哄簱鍗�
if (!Cools.isEmpty(orders)) {
- Iterator<OrderPakin> iterator = orders.iterator();
+ Iterator<OrderPakout> iterator = orders.iterator();
while (iterator.hasNext()) {
- OrderPakin order = iterator.next();
+ OrderPakout order = iterator.next();
if (order.getDocType() != null) {
DocType docType = docTypeService.selectById(order.getDocType());
if (docType != null) {
@@ -129,7 +130,7 @@
@RequestParam(required = false) String orderByField,
@RequestParam(required = false) String orderByType,
@RequestParam Map<String, Object> param) {
- EntityWrapper<OrderPakin> wrapper = new EntityWrapper<>();
+ EntityWrapper<OrderPakout> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
if (!Cools.isEmpty(orderByField)) {
@@ -144,13 +145,13 @@
@RequestMapping(value = "/order/detl/all/auth")
@ManagerAuth
public R head(@RequestParam Long orderId) {
- return R.ok().add(orderDetlService.selectList(new EntityWrapper<OrderDetlPakout>().eq("order_id", orderId)));
+ return R.ok().add(orderDetlPakoutService.selectList(new EntityWrapper<OrderDetlPakout>().eq("order_id", orderId)));
}
@RequestMapping(value = "/order/form/add/auth")
@ManagerAuth(memo = "鎵嬪姩娣诲姞璁㈠崟")
@Transactional
- public R formAdd(@RequestBody OrderDomainParam param) {
+ public R formAdd(@RequestBody OrderPakoutDomainParam param) {
if (Cools.isEmpty(param.getOrderNo())) {
String prefix = "";
DocType docType = docTypeService.selectById(param.getDocType());
@@ -159,12 +160,12 @@
}
param.setOrderNo(prefix + snowflakeIdWorker.nextId());
}
- OrderPakin order = orderService.selectByNo(param.getOrderNo());
+ OrderPakout order = orderService.selectByNo(param.getOrderNo());
if (order != null) {
return R.error("鍗曟嵁缂栧彿宸插瓨鍦�");
}
Date now = new Date();
- order = new OrderPakin(
+ order = new OrderPakout(
String.valueOf(snowflakeIdWorker.nextId()), // 缂栧彿[闈炵┖]
param.getOrderNo(), // 璁㈠崟缂栧彿
DateUtils.convert(now), // 鍗曟嵁鏃ユ湡
@@ -204,12 +205,12 @@
throw new CoolException("淇濆瓨璁㈠崟涓绘。澶辫触");
}
List<DetlDto> list = new ArrayList<>();
- for (OrderDetlPakout orderDetlPakout : param.getOrderDetlPakoutList()) {
+ for (OrderDetlPakout orderDetlPakout : param.getOrderDetlList()) {
DetlDto dto = new DetlDto(orderDetlPakout.getMatnr(), orderDetlPakout.getBatch());
if (DetlDto.has(list, dto)) {
- OrderDetlPakout item = orderDetlService.selectItem(order.getId(), orderDetlPakout.getMatnr(), orderDetlPakout.getBatch());
+ OrderDetlPakout item = orderDetlPakoutService.selectItem(order.getId(), orderDetlPakout.getMatnr(), orderDetlPakout.getBatch());
item.setAnfme(item.getAnfme() + orderDetlPakout.getAnfme());
- if (!orderDetlService.updateById(item)) {
+ if (!orderDetlPakoutService.updateById(item)) {
throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�");
}
} else {
@@ -222,7 +223,7 @@
orderDetlPakout.setUpdateTime(now);
orderDetlPakout.setStatus(1);
orderDetlPakout.setQty(0.0D);
- if (!orderDetlService.insert(orderDetlPakout)) {
+ if (!orderDetlPakoutService.insert(orderDetlPakout)) {
throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�");
}
}
@@ -233,8 +234,8 @@
@RequestMapping(value = "/order/form/modify/auth")
@ManagerAuth(memo = "鎵嬪姩淇敼璁㈠崟")
@Transactional
- public R formModify(@RequestBody OrderDomainParam param) {
- OrderPakin order = orderService.selectById(param.getOrderId());
+ public R formModify(@RequestBody OrderPakoutDomainParam param) {
+ OrderPakout order = orderService.selectById(param.getOrderId());
if (order == null || order.getStatus() == 0) {
return R.error("璁㈠崟涓嶅瓨鍦�");
}
@@ -252,17 +253,17 @@
// 淇敼鏄庣粏妗�
// List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
// 1.娓呯┖鏄庣粏妗�
- if (!orderDetlService.delete(new EntityWrapper<OrderDetlPakout>().eq("order_id", order.getId()))) {
+ if (!orderDetlPakoutService.delete(new EntityWrapper<OrderDetlPakout>().eq("order_id", order.getId()))) {
throw new CoolException("娓呯┖璁㈠崟鏄庣粏澶辫触");
}
// 2.閲嶇粍鏁版嵁
List<DetlDto> list = new ArrayList<>();
- for (OrderDetlPakout orderDetlPakout : param.getOrderDetlPakoutList()) {
+ for (OrderDetlPakout orderDetlPakout : param.getOrderDetlList()) {
DetlDto dto = new DetlDto(orderDetlPakout.getMatnr(), orderDetlPakout.getBatch());
if (DetlDto.has(list, dto)) {
- OrderDetlPakout item = orderDetlService.selectItem(order.getId(), orderDetlPakout.getMatnr(), orderDetlPakout.getBatch());
+ OrderDetlPakout item = orderDetlPakoutService.selectItem(order.getId(), orderDetlPakout.getMatnr(), orderDetlPakout.getBatch());
item.setAnfme(item.getAnfme() + orderDetlPakout.getAnfme());
- if (!orderDetlService.updateById(item)) {
+ if (!orderDetlPakoutService.updateById(item)) {
throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�");
}
} else {
@@ -275,7 +276,7 @@
orderDetlPakout.setUpdateTime(now);
orderDetlPakout.setStatus(1);
orderDetlPakout.setQty(0.0D);
- if (!orderDetlService.insert(orderDetlPakout)) {
+ if (!orderDetlPakoutService.insert(orderDetlPakout)) {
throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�");
}
}
@@ -286,12 +287,12 @@
@PostMapping(value = "/order/wrk/trace/auth")
@ManagerAuth
public R orderWrkTrace(@RequestParam("orderId") Long orderId) {
- OrderPakin order = orderService.selectById(orderId);
+ OrderPakout order = orderService.selectById(orderId);
if (null == order) {
return R.error("鍗曟嵁涓嶅瓨鍦�");
}
// 鏁伴噺缁熻
- List<OrderDetlPakout> orderDetlPakouts = orderDetlService.selectByOrderId(orderId);
+ List<OrderDetlPakout> orderDetlPakouts = orderDetlPakoutService.selectByOrderId(orderId);
double totalQty = 0;
double wrkQty = 0;
double lackQty = 0;
@@ -373,7 +374,7 @@
@RequestParam(required = false) String orderByField,
@RequestParam(required = false) String orderByType,
@RequestParam Map<String, Object> param) {
- EntityWrapper<OrderPakin> wrapper = new EntityWrapper<>();
+ EntityWrapper<OrderPakout> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
if (!Cools.isEmpty(orderByField)) {
@@ -397,7 +398,7 @@
@RequestMapping(value = "/order/update/auth")
@ManagerAuth
- public R update(OrderPakin order) {
+ public R update(OrderPakout order) {
if (Cools.isEmpty(order) || null == order.getId()) {
return R.error();
}
@@ -438,22 +439,22 @@
@RequestMapping(value = "/order/export/auth")
@ManagerAuth
public R export(@RequestBody JSONObject param) {
- EntityWrapper<OrderPakin> wrapper = new EntityWrapper<>();
+ EntityWrapper<OrderPakout> wrapper = new EntityWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("order"));
convert(map, wrapper);
- List<OrderPakin> list = orderService.selectList(wrapper);
+ List<OrderPakout> list = orderService.selectList(wrapper);
return R.ok(exportSupport(list, fields));
}
@RequestMapping(value = "/orderQuery/auth")
@ManagerAuth
public R query(String condition) {
- EntityWrapper<OrderPakin> wrapper = new EntityWrapper<>();
+ EntityWrapper<OrderPakout> wrapper = new EntityWrapper<>();
wrapper.like("id", condition);
- Page<OrderPakin> page = orderService.selectPage(new Page<>(0, 10), wrapper);
+ Page<OrderPakout> page = orderService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (OrderPakin order : page.getRecords()) {
+ for (OrderPakout order : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", order.getId());
map.put("value", order.getOrderNo());
@@ -465,9 +466,9 @@
@RequestMapping(value = "/order/check/column/auth")
@ManagerAuth
public R query(@RequestBody JSONObject param) {
- Wrapper<OrderPakin> wrapper = new EntityWrapper<OrderPakin>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ Wrapper<OrderPakout> wrapper = new EntityWrapper<OrderPakout>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
if (null != orderService.selectOne(wrapper)) {
- return R.parse(BaseRes.REPEAT).add(getComment(OrderPakin.class, String.valueOf(param.get("key"))));
+ return R.parse(BaseRes.REPEAT).add(getComment(OrderPakout.class, String.valueOf(param.get("key"))));
}
return R.ok();
}
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index 7d6a338..595e31b 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -34,9 +34,9 @@
public class OutController extends BaseController {
@Autowired
- private OrderService orderService;
+ private OrderPakoutService orderPakoutService;
@Autowired
- private OrderDetlService orderDetlService;
+ private OrderDetlPakoutService orderDetlPakoutService;
@Autowired
private LocDetlService locDetlService;
@Autowired
@@ -53,7 +53,7 @@
@ManagerAuth
public R pakoutOrderDetlIds(@RequestParam Long orderId) throws InterruptedException {
Thread.sleep(200);
- return R.ok().add(orderDetlService.selectByOrderId(orderId).stream().map(OrderDetlPakout::getId).distinct().collect(Collectors.toList()));
+ return R.ok().add(orderDetlPakoutService.selectByOrderId(orderId).stream().map(OrderDetlPakout::getId).distinct().collect(Collectors.toList()));
}
@PostMapping("/out/pakout/OrderOutGetLoc/auth")
@@ -63,7 +63,7 @@
return R.parse(BaseRes.PARAM);
}
// 鑾峰彇璁㈠崟鏄庣粏骞跺鐞�
- List<OrderDetlPakout> orderDetlPakouts = orderDetlService.selectBatchIds(ids);
+ List<OrderDetlPakout> orderDetlPakouts = orderDetlPakoutService.selectBatchIds(ids);
Set<String> processedLocs = new HashSet<>(); // 宸插鐞嗚揣浣嶇紦瀛�
Set<ExistDto> processedStock = new HashSet<>(); // 宸插鐞嗗簱瀛樼紦瀛�
List<LocDto> result = new ArrayList<>();
@@ -94,7 +94,7 @@
// 鑾峰彇璁㈠崟鏄庣粏骞跺鐞�
- List<OrderDetlPakout> orderDetlPakouts = orderDetlService.selectBatchIds(ids);
+ List<OrderDetlPakout> orderDetlPakouts = orderDetlPakoutService.selectBatchIds(ids);
Set<String> processedLocs = new HashSet<>(); // 宸插鐞嗚揣浣嶇紦瀛�
Set<ExistDto> processedStock = new HashSet<>(); // 宸插鐞嗗簱瀛樼紦瀛�
List<LocDto> result = new ArrayList<>();
@@ -271,7 +271,7 @@
if (Cools.isEmpty(ids)) {
return R.parse(BaseRes.PARAM);
}
- List<OrderDetlPakout> orderDetlPakouts = orderDetlService.selectBatchIds(ids);
+ List<OrderDetlPakout> orderDetlPakouts = orderDetlPakoutService.selectBatchIds(ids);
List<LocDto> locDtos = new ArrayList<>();
Set<String> exist = new HashSet<>();
@@ -339,7 +339,7 @@
if (Cools.isEmpty(ids)) {
return R.parse(BaseRes.PARAM);
}
- List<OrderDetlPakout> orderDetlPakouts = orderDetlService.selectBatchIds(ids);
+ List<OrderDetlPakout> orderDetlPakouts = orderDetlPakoutService.selectBatchIds(ids);
List<LocDto> locDtos = new ArrayList<>();
Set<String> exist = new HashSet<>();
@@ -406,7 +406,7 @@
if (Cools.isEmpty(ids)) {
return R.parse(BaseRes.PARAM);
}
- List<OrderDetlPakout> orderDetlPakouts = orderDetlService.selectBatchIds(ids);
+ List<OrderDetlPakout> orderDetlPakouts = orderDetlPakoutService.selectBatchIds(ids);
List<LocDto> locDtos = new ArrayList<>();
Set<String> exist = new HashSet<>();
@@ -465,7 +465,7 @@
if (Cools.isEmpty(ids)) {
return R.parse(BaseRes.PARAM);
}
- List<OrderDetlPakout> orderDetlPakouts = orderDetlService.selectBatchIds(ids);
+ List<OrderDetlPakout> orderDetlPakouts = orderDetlPakoutService.selectBatchIds(ids);
List<LocDto> locDtos = new ArrayList<>();
Set<String> exist = new HashSet<>();
@@ -523,7 +523,7 @@
if (Cools.isEmpty(ids)) {
return R.parse(BaseRes.PARAM);
}
- List<OrderDetlPakout> orderDetlPakouts = orderDetlService.selectBatchIds(ids);
+ List<OrderDetlPakout> orderDetlPakouts = orderDetlPakoutService.selectBatchIds(ids);
List<LocDto> locDtos = new ArrayList<>();
Set<String> exist = new HashSet<>();
@@ -582,7 +582,7 @@
if (Cools.isEmpty(ids)) {
return R.parse(BaseRes.PARAM);
}
- List<OrderDetlPakout> orderDetlPakouts = orderDetlService.selectBatchIds(ids);
+ List<OrderDetlPakout> orderDetlPakouts = orderDetlPakoutService.selectBatchIds(ids);
List<LocDto> locDtos = new ArrayList<>();
Set<String> exist = new HashSet<>();
diff --git a/src/main/java/com/zy/asrs/controller/WaitPakinController.java b/src/main/java/com/zy/asrs/controller/WaitPakinController.java
index e541fea..e7bf999 100644
--- a/src/main/java/com/zy/asrs/controller/WaitPakinController.java
+++ b/src/main/java/com/zy/asrs/controller/WaitPakinController.java
@@ -10,9 +10,10 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
+import com.zy.asrs.entity.OrderDetlPakin;
import com.zy.asrs.entity.WaitPakin;
import com.zy.asrs.entity.WrkMast;
-import com.zy.asrs.service.OrderDetlService;
+import com.zy.asrs.service.OrderDetlPakinService;
import com.zy.asrs.service.WaitPakinService;
import com.zy.asrs.service.WrkMastService;
import com.zy.common.web.BaseController;
@@ -31,7 +32,7 @@
@Autowired
private WaitPakinService waitPakinService;
@Autowired
- private OrderDetlService orderDetlService;
+ private OrderDetlPakinService orderDetlPakinService;
@Autowired
private WrkMastService wrkMastService;
@@ -105,7 +106,7 @@
waitPakinService.delete(new EntityWrapper<>(entity));
//璁㈠崟鍏宠仈锛屼慨鏀硅鍗曚綔涓氭暟閲�
if (!Cools.isEmpty(entity.getOrderNo())) {
- if (!orderDetlService.decrease(entity.getOrderNo(), entity.getMatnr(), entity.getBatch(), entity.getAnfme())) {
+ if (!orderDetlPakinService.decrease(entity.getOrderNo(), entity.getMatnr(), entity.getBatch(), entity.getAnfme())) {
return R.error("璁㈠崟鏁版嵁鍥炴粴澶辫触");
}
}
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetlPakin.java b/src/main/java/com/zy/asrs/entity/OrderDetlPakin.java
index 79e5a73..dfc499e 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetlPakin.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetlPakin.java
@@ -6,7 +6,6 @@
import com.baomidou.mybatisplus.enums.IdType;
import com.core.common.Cools;
import com.core.common.SpringUtils;
-import com.zy.asrs.service.OrderService;
import com.zy.common.utils.Synchro;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
@@ -349,14 +348,6 @@
this.memo = memo;
}
- public String getOrderId$() {
- OrderService service = SpringUtils.getBean(OrderService.class);
- OrderPakin order = service.selectById(this.orderId);
- if (!Cools.isEmpty(order)) {
- return String.valueOf(order.getId());
- }
- return null;
- }
public String getBeBatch$() {
if (null == this.beBatch) {
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetlPakout.java b/src/main/java/com/zy/asrs/entity/OrderDetlPakout.java
index 6467d89..a919f96 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetlPakout.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetlPakout.java
@@ -6,7 +6,6 @@
import com.baomidou.mybatisplus.enums.IdType;
import com.core.common.Cools;
import com.core.common.SpringUtils;
-import com.zy.asrs.service.OrderService;
import com.zy.common.utils.Synchro;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
@@ -349,15 +348,7 @@
this.memo = memo;
}
- public String getOrderId$() {
- OrderService service = SpringUtils.getBean(OrderService.class);
- OrderPakin order = service.selectById(this.orderId);
- if (!Cools.isEmpty(order)) {
- return String.valueOf(order.getId());
- }
- return null;
- }
-
+
public String getBeBatch$() {
if (null == this.beBatch) {
return null;
diff --git a/src/main/java/com/zy/asrs/entity/OrderReportLog.java b/src/main/java/com/zy/asrs/entity/OrderReportLog.java
new file mode 100644
index 0000000..a69003a
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/OrderReportLog.java
@@ -0,0 +1,471 @@
+package com.zy.asrs.entity;
+
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
+import com.core.common.Cools;
+import com.core.common.SpringUtils;
+import com.zy.asrs.service.DocTypeService;
+import com.zy.asrs.service.OrderSettleService;
+import com.zy.system.entity.User;
+import com.zy.system.service.UserService;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+@Data
+@TableName("man_order_report")
+public class OrderReportLog implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * ID
+ */
+ @ApiModelProperty(value = "ID")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 缂栧彿
+ */
+ @ApiModelProperty(value = "缂栧彿")
+ private String uuid;
+
+ /**
+ * 璁㈠崟缂栧彿
+ */
+ @ApiModelProperty(value = "璁㈠崟缂栧彿")
+ @TableField("order_no")
+ private String orderNo;
+
+ /**
+ * 鍗曟嵁鏃ユ湡
+ */
+ @ApiModelProperty(value = "鍗曟嵁鏃ユ湡")
+ @TableField("order_time")
+ private String orderTime;
+
+ /**
+ * 鍗曟嵁绫诲瀷
+ */
+ @ApiModelProperty(value = "鍗曟嵁绫诲瀷")
+ @TableField("doc_type")
+ private Long docType;
+
+ /**
+ * 椤圭洰缂栧彿
+ */
+ @ApiModelProperty(value = "椤圭洰缂栧彿")
+ @TableField("item_id")
+ private Long itemId;
+
+ @ApiModelProperty(value = "")
+ @TableField("item_name")
+ private String itemName;
+
+ /**
+ * 璋冩嫧椤圭洰缂栧彿
+ */
+ @ApiModelProperty(value = "璋冩嫧椤圭洰缂栧彿")
+ @TableField("allot_item_id")
+ private Long allotItemId;
+
+ /**
+ * 鍒濆绁ㄦ嵁鍙�
+ */
+ @ApiModelProperty(value = "鍒濆绁ㄦ嵁鍙�")
+ @TableField("def_number")
+ private String defNumber;
+
+ /**
+ * 绁ㄦ嵁鍙�
+ */
+ @ApiModelProperty(value = "绁ㄦ嵁鍙�")
+ private String number;
+
+ /**
+ * 瀹㈡埛缂栧彿
+ */
+ @ApiModelProperty(value = "瀹㈡埛缂栧彿")
+ private Long cstmr;
+
+ /**
+ * 瀹㈡埛
+ */
+ @ApiModelProperty(value = "瀹㈡埛")
+ @TableField("cstmr_name")
+ private String cstmrName;
+
+ /**
+ * 鑱旂郴鏂瑰紡
+ */
+ @ApiModelProperty(value = "鑱旂郴鏂瑰紡")
+ private String tel;
+
+ /**
+ * 鎿嶄綔浜哄憳
+ */
+ @ApiModelProperty(value = "鎿嶄綔浜哄憳")
+ @TableField("oper_memb")
+ private String operMemb;
+
+ /**
+ * 鍚堣閲戦
+ */
+ @ApiModelProperty(value = "鍚堣閲戦")
+ @TableField("total_fee")
+ private Double totalFee;
+
+ /**
+ * 浼樻儬鐜�
+ */
+ @ApiModelProperty(value = "浼樻儬鐜�")
+ private Double discount;
+
+ /**
+ * 浼樻儬閲戦
+ */
+ @ApiModelProperty(value = "浼樻儬閲戦")
+ @TableField("discount_fee")
+ private Double discountFee;
+
+ /**
+ * 閿�鍞垨閲囪喘璐圭敤鍚堣
+ */
+ @ApiModelProperty(value = "閿�鍞垨閲囪喘璐圭敤鍚堣")
+ @TableField("other_fee")
+ private Double otherFee;
+
+ /**
+ * 瀹炰粯閲戦
+ */
+ @ApiModelProperty(value = "瀹炰粯閲戦")
+ @TableField("act_fee")
+ private Double actFee;
+
+ /**
+ * 浠樻绫诲瀷 1: 鐜伴噾 2: 璁拌处
+ */
+ @ApiModelProperty(value = "浠樻绫诲瀷 1: 鐜伴噾 2: 璁拌处 ")
+ @TableField("pay_type")
+ private Integer payType;
+
+ /**
+ * 涓氬姟鍛�
+ */
+ @ApiModelProperty(value = "涓氬姟鍛�")
+ private String salesman;
+
+ /**
+ * 缁撶畻澶╂暟
+ */
+ @ApiModelProperty(value = "缁撶畻澶╂暟")
+ @TableField("account_day")
+ private Integer accountDay;
+
+ /**
+ * 閭垂鏀粯绫诲瀷 1: 鍦ㄧ嚎鏀粯 2: 璐у埌浠樻
+ */
+ @ApiModelProperty(value = "閭垂鏀粯绫诲瀷 1: 鍦ㄧ嚎鏀粯 2: 璐у埌浠樻 ")
+ @TableField("post_fee_type")
+ private Integer postFeeType;
+
+ /**
+ * 閭垂
+ */
+ @ApiModelProperty(value = "閭垂")
+ @TableField("post_fee")
+ private Double postFee;
+
+ /**
+ * 浠樻鏃堕棿
+ */
+ @ApiModelProperty(value = "浠樻鏃堕棿")
+ @TableField("pay_time")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date payTime;
+
+ /**
+ * 鍙戣揣鏃堕棿
+ */
+ @ApiModelProperty(value = "鍙戣揣鏃堕棿")
+ @TableField("send_time")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date sendTime;
+
+ /**
+ * 鐗╂祦鍚嶇О
+ */
+ @ApiModelProperty(value = "鐗╂祦鍚嶇О")
+ @TableField("ship_name")
+ private String shipName;
+
+ /**
+ * 鐗╂祦鍗曞彿
+ */
+ @ApiModelProperty(value = "鐗╂祦鍗曞彿")
+ @TableField("ship_code")
+ private String shipCode;
+
+ /**
+ * 璁㈠崟鐘舵��
+ */
+ @ApiModelProperty(value = "璁㈠崟鐘舵��")
+ private Long settle;
+
+ /**
+ * 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
+ */
+ @ApiModelProperty(value = "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
+ private Integer status;
+
+ /**
+ * 娣诲姞浜哄憳
+ */
+ @ApiModelProperty(value = "娣诲姞浜哄憳")
+ @TableField("create_by")
+ private Long createBy;
+
+ /**
+ * 娣诲姞鏃堕棿
+ */
+ @ApiModelProperty(value = "娣诲姞鏃堕棿")
+ @TableField("create_time")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ /**
+ * 淇敼浜哄憳
+ */
+ @ApiModelProperty(value = "淇敼浜哄憳")
+ @TableField("update_by")
+ private Long updateBy;
+
+ /**
+ * 淇敼鏃堕棿
+ */
+ @ApiModelProperty(value = "淇敼鏃堕棿")
+ @TableField("update_time")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date updateTime;
+
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty(value = "澶囨敞")
+ private String memo;
+
+ /**
+ * 鐘舵�� 1: 杩涜涓� 0: 鍒濆 2:宸插畬鎴�
+ */
+ @ApiModelProperty(value = "鐘舵�� 2:宸插畬鎴� 1: 杩涜涓� 0: 鍒濆 ")
+ @TableField("move_status")
+ private Integer moveStatus;
+
+ public OrderReportLog() {
+ }
+
+ public OrderReportLog(String uuid, String orderNo, String orderTime, Long docType, Long itemId, String itemName, Long allotItemId, String defNumber, String number, Long cstmr, String cstmrName, String tel, String operMemb, Double totalFee, Double discount, Double discountFee, Double otherFee, Double actFee, Integer payType, String salesman, Integer accountDay, Integer postFeeType, Double postFee, Date payTime, Date sendTime, String shipName, String shipCode, Long settle, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
+ this.uuid = uuid;
+ this.orderNo = orderNo;
+ this.orderTime = orderTime;
+ this.docType = docType;
+ this.itemId = itemId;
+ this.itemName = itemName;
+ this.allotItemId = allotItemId;
+ this.defNumber = defNumber;
+ this.number = number;
+ this.cstmr = cstmr;
+ this.cstmrName = cstmrName;
+ this.tel = tel;
+ this.operMemb = operMemb;
+ this.totalFee = totalFee;
+ this.discount = discount;
+ this.discountFee = discountFee;
+ this.otherFee = otherFee;
+ this.actFee = actFee;
+ this.payType = payType;
+ this.salesman = salesman;
+ this.accountDay = accountDay;
+ this.postFeeType = postFeeType;
+ this.postFee = postFee;
+ this.payTime = payTime;
+ this.sendTime = sendTime;
+ this.shipName = shipName;
+ this.shipCode = shipCode;
+ this.settle = settle;
+ this.status = status;
+ this.createBy = createBy;
+ this.createTime = createTime;
+ this.updateBy = updateBy;
+ this.updateTime = updateTime;
+ this.memo = memo;
+ }
+
+// Order order = new Order(
+// null, // 缂栧彿[闈炵┖]
+// null, // 璁㈠崟缂栧彿
+// null, // 鍗曟嵁鏃ユ湡
+// null, // 鍗曟嵁绫诲瀷
+// null, // 椤圭洰缂栧彿
+// null, //
+// null, // 璋冩嫧椤圭洰缂栧彿
+// null, // 鍒濆绁ㄦ嵁鍙�
+// null, // 绁ㄦ嵁鍙�
+// null, // 瀹㈡埛缂栧彿
+// null, // 瀹㈡埛
+// null, // 鑱旂郴鏂瑰紡
+// null, // 鎿嶄綔浜哄憳
+// null, // 鍚堣閲戦
+// null, // 浼樻儬鐜�
+// null, // 浼樻儬閲戦
+// null, // 閿�鍞垨閲囪喘璐圭敤鍚堣
+// null, // 瀹炰粯閲戦
+// null, // 浠樻绫诲瀷
+// null, // 涓氬姟鍛�
+// null, // 缁撶畻澶╂暟
+// null, // 閭垂鏀粯绫诲瀷
+// null, // 閭垂
+// null, // 浠樻鏃堕棿
+// null, // 鍙戣揣鏃堕棿
+// null, // 鐗╂祦鍚嶇О
+// null, // 鐗╂祦鍗曞彿
+// null, // 璁㈠崟鐘舵��
+// null, // 鐘舵��
+// null, // 娣诲姞浜哄憳
+// null, // 娣诲姞鏃堕棿
+// null, // 淇敼浜哄憳
+// null, // 淇敼鏃堕棿
+// null // 澶囨敞
+// );
+
+ public String getDocType$() {
+ DocTypeService service = SpringUtils.getBean(DocTypeService.class);
+ DocType docType = service.selectById(this.docType);
+ if (!Cools.isEmpty(docType)) {
+ return String.valueOf(docType.getDocName());
+ }
+ return null;
+ }
+
+ public String getPayType$() {
+ if (null == this.payType) {
+ return null;
+ }
+ switch (this.payType) {
+ case 1:
+ return "鐜伴噾";
+ case 2:
+ return "璁拌处";
+ default:
+ return String.valueOf(this.payType);
+ }
+ }
+
+ public String getPostFeeType$() {
+ if (null == this.postFeeType) {
+ return null;
+ }
+ switch (this.postFeeType) {
+ case 1:
+ return "鍦ㄧ嚎鏀粯";
+ case 2:
+ return "璐у埌浠樻";
+ default:
+ return String.valueOf(this.postFeeType);
+ }
+ }
+
+ public String getPayTime$() {
+ if (Cools.isEmpty(this.payTime)) {
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.payTime);
+ }
+
+ public String getSendTime$() {
+ if (Cools.isEmpty(this.sendTime)) {
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.sendTime);
+ }
+
+ public String getSettle$() {
+ OrderSettleService service = SpringUtils.getBean(OrderSettleService.class);
+ OrderSettle orderSettle = service.selectById(this.settle);
+ if (!Cools.isEmpty(orderSettle)) {
+ return String.valueOf(orderSettle.getSettleName());
+ }
+ return null;
+ }
+
+ public String getStatus$() {
+ if (null == this.status) {
+ return null;
+ }
+ switch (this.status) {
+ case 1:
+ return "姝ｅ父";
+ case 0:
+ return "绂佺敤";
+ default:
+ return String.valueOf(this.status);
+ }
+ }
+
+ public String getMoveStatus$() {
+ if (null == this.moveStatus) {
+ return null;
+ }
+ switch (this.moveStatus) {
+ case 2:
+ return "宸插璐�";
+ case 1:
+ return "澶囪揣涓�";
+ case 0:
+ return "鏈垵濮�";
+ default:
+ return String.valueOf(this.moveStatus);
+ }
+ }
+
+ public String getCreateBy$() {
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.selectById(this.createBy);
+ if (!Cools.isEmpty(user)) {
+ return String.valueOf(user.getUsername());
+ }
+ return null;
+ }
+
+ public String getCreateTime$() {
+ if (Cools.isEmpty(this.createTime)) {
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
+ }
+
+ public String getUpdateBy$() {
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.selectById(this.updateBy);
+ if (!Cools.isEmpty(user)) {
+ return String.valueOf(user.getUsername());
+ }
+ return null;
+ }
+
+ public String getUpdateTime$() {
+ if (Cools.isEmpty(this.updateTime)) {
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
+ }
+
+
+}
diff --git a/src/main/java/com/zy/asrs/entity/param/OrderDomainParam.java b/src/main/java/com/zy/asrs/entity/param/OrderPakinDomainParam.java
similarity index 67%
copy from src/main/java/com/zy/asrs/entity/param/OrderDomainParam.java
copy to src/main/java/com/zy/asrs/entity/param/OrderPakinDomainParam.java
index 42546f7..028a0c3 100644
--- a/src/main/java/com/zy/asrs/entity/param/OrderDomainParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/OrderPakinDomainParam.java
@@ -1,5 +1,6 @@
package com.zy.asrs.entity.param;
+import com.zy.asrs.entity.OrderDetlPakin;
import com.zy.asrs.entity.OrderDetlPakout;
import lombok.Data;
@@ -9,7 +10,7 @@
* Created by vincent on 2022/3/24
*/
@Data
-public class OrderDomainParam {
+public class OrderPakinDomainParam {
private Long orderId;
@@ -17,7 +18,7 @@
private String orderNo;
- private List<OrderDetlPakout> orderDetlPakoutList;
+ private List<OrderDetlPakin> orderDetlList;
}
diff --git a/src/main/java/com/zy/asrs/entity/param/OrderDomainParam.java b/src/main/java/com/zy/asrs/entity/param/OrderPakoutDomainParam.java
similarity index 74%
rename from src/main/java/com/zy/asrs/entity/param/OrderDomainParam.java
rename to src/main/java/com/zy/asrs/entity/param/OrderPakoutDomainParam.java
index 42546f7..fffcc0d 100644
--- a/src/main/java/com/zy/asrs/entity/param/OrderDomainParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/OrderPakoutDomainParam.java
@@ -9,7 +9,7 @@
* Created by vincent on 2022/3/24
*/
@Data
-public class OrderDomainParam {
+public class OrderPakoutDomainParam {
private Long orderId;
@@ -17,7 +17,7 @@
private String orderNo;
- private List<OrderDetlPakout> orderDetlPakoutList;
+ private List<OrderDetlPakout> orderDetlList;
}
diff --git a/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java b/src/main/java/com/zy/asrs/mapper/OrderDetlPakinMapper.java
similarity index 70%
copy from src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java
copy to src/main/java/com/zy/asrs/mapper/OrderDetlPakinMapper.java
index 8490b74..a8027b6 100644
--- a/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/OrderDetlPakinMapper.java
@@ -1,7 +1,7 @@
package com.zy.asrs.mapper;
import com.baomidou.mybatisplus.mapper.BaseMapper;
-import com.zy.asrs.entity.OrderDetlPakout;
+import com.zy.asrs.entity.OrderDetlPakin;
import com.zy.asrs.entity.param.PrintDataDto;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -12,15 +12,15 @@
@Mapper
@Repository
-public interface OrderDetlMapper extends BaseMapper<OrderDetlPakout> {
+public interface OrderDetlPakinMapper extends BaseMapper<OrderDetlPakin> {
- OrderDetlPakout selectItem(@Param("orderId") Long orderId, @Param("matnr") String matnr, @Param("batch") String batch);
+ OrderDetlPakin selectItem(@Param("orderId") Long orderId, @Param("matnr") String matnr, @Param("batch") String batch);
- OrderDetlPakout selectItemByOrderNo(@Param("orderNo") String orderNo, @Param("matnr") String matnr, @Param("batch") String batch);
+ OrderDetlPakin selectItemByOrderNo(@Param("orderNo") String orderNo, @Param("matnr") String matnr, @Param("batch") String batch);
- List<OrderDetlPakout> selectWorkingDetls(Long orderId);
+ List<OrderDetlPakin> selectWorkingDetls(Long orderId);
- List<OrderDetlPakout> getPakoutPage(Map<String, Object> map);
+ List<OrderDetlPakin> getPakoutPage(Map<String, Object> map);
Integer getPakoutPageCount(Map<String, Object> map);
@@ -30,7 +30,7 @@
int modifyStatus(@Param("orderId") Long orderId, @Param("status") Integer status);
- int addToLogTable(OrderDetlPakout orderDetlPakout);
+ int addToLogTable(OrderDetlPakin OrderDetlPakin);
int increaseQtyByOrderNo(@Param("orderNo") String orderNo, @Param("matnr") String matnr, @Param("batch") String batch, @Param("qty") Double qty);
diff --git a/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java b/src/main/java/com/zy/asrs/mapper/OrderDetlPakoutMapper.java
similarity index 95%
rename from src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java
rename to src/main/java/com/zy/asrs/mapper/OrderDetlPakoutMapper.java
index 8490b74..8e38642 100644
--- a/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/OrderDetlPakoutMapper.java
@@ -12,7 +12,7 @@
@Mapper
@Repository
-public interface OrderDetlMapper extends BaseMapper<OrderDetlPakout> {
+public interface OrderDetlPakoutMapper extends BaseMapper<OrderDetlPakout> {
OrderDetlPakout selectItem(@Param("orderId") Long orderId, @Param("matnr") String matnr, @Param("batch") String batch);
diff --git a/src/main/java/com/zy/asrs/mapper/OrderMapper.java b/src/main/java/com/zy/asrs/mapper/OrderPakinMapper.java
similarity index 91%
rename from src/main/java/com/zy/asrs/mapper/OrderMapper.java
rename to src/main/java/com/zy/asrs/mapper/OrderPakinMapper.java
index bff1eca..a9acc1a 100644
--- a/src/main/java/com/zy/asrs/mapper/OrderMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/OrderPakinMapper.java
@@ -10,7 +10,7 @@
@Mapper
@Repository
-public interface OrderMapper extends BaseMapper<OrderPakin> {
+public interface OrderPakinMapper extends BaseMapper<OrderPakin> {
int updateSettle(@Param("orderId") Long orderId, @Param("settle") Long settle, @Param("userId") Long userId);
diff --git a/src/main/java/com/zy/asrs/mapper/OrderPakoutMapper.java b/src/main/java/com/zy/asrs/mapper/OrderPakoutMapper.java
new file mode 100644
index 0000000..736e2b6
--- /dev/null
+++ b/src/main/java/com/zy/asrs/mapper/OrderPakoutMapper.java
@@ -0,0 +1,29 @@
+package com.zy.asrs.mapper;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.zy.asrs.entity.OrderPakout;
+import com.zy.asrs.entity.OrderPakout;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Mapper
+@Repository
+public interface OrderPakoutMapper extends BaseMapper<OrderPakout> {
+
+ int updateSettle(@Param("orderId") Long orderId, @Param("settle") Long settle, @Param("userId") Long userId);
+
+ List<OrderPakout> selectComplete();
+
+ List<OrderPakout> selectComplete8();
+
+ int addToLogTable(OrderPakout order);
+
+ List<OrderPakout> selectorderNoL(@Param("orderNo") String orderNo);
+
+ OrderPakout selectOrderMoveStatus();
+
+ OrderPakout selectOrderMoveStatusInitial();
+}
diff --git a/src/main/java/com/zy/asrs/mapper/OrderReportMapper.java b/src/main/java/com/zy/asrs/mapper/OrderReportMapper.java
new file mode 100644
index 0000000..875383c
--- /dev/null
+++ b/src/main/java/com/zy/asrs/mapper/OrderReportMapper.java
@@ -0,0 +1,17 @@
+package com.zy.asrs.mapper;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.zy.asrs.entity.OrderPakin;
+import com.zy.asrs.entity.OrderReport;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Mapper
+@Repository
+public interface OrderReportMapper extends BaseMapper<OrderReport> {
+
+
+}
diff --git a/src/main/java/com/zy/asrs/service/OpenService.java b/src/main/java/com/zy/asrs/service/OpenService.java
index 6ef5f86..4b0c985 100644
--- a/src/main/java/com/zy/asrs/service/OpenService.java
+++ b/src/main/java/com/zy/asrs/service/OpenService.java
@@ -48,5 +48,8 @@
void syncTag(List<TagParam> param);
- void orderDelete(String orderNo);
+ void orderPakinDelete(String orderNo);
+
+ void orderPakoutDelete(String orderNo);
+
}
diff --git a/src/main/java/com/zy/asrs/service/OrderDetlPakinService.java b/src/main/java/com/zy/asrs/service/OrderDetlPakinService.java
new file mode 100644
index 0000000..d9a3b1d
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/OrderDetlPakinService.java
@@ -0,0 +1,43 @@
+package com.zy.asrs.service;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.service.IService;
+import com.zy.asrs.entity.OrderDetlPakin;
+
+import java.util.List;
+
+public interface OrderDetlPakinService extends IService<OrderDetlPakin> {
+
+ List<OrderDetlPakin> selectByOrderId(Long orderId);
+
+ Page<OrderDetlPakin> getPakoutPage(Page<OrderDetlPakin> page);
+
+ OrderDetlPakin selectItem(Long orderId, String matnr, String batch);
+
+ OrderDetlPakin selectItem(String orderNo, String matnr, String batch);
+
+ OrderDetlPakin findByLook(List<OrderDetlPakin> OrderDetlPakins, Long orderId, String matnr, String batch);
+
+ boolean increase(Long orderId, String matnr, String batch, Double qty);
+
+ boolean decrease(String orderNo, String matnr, String batch, Double qty);
+
+ boolean modifyStatus(Long orderId, Integer status);
+
+ boolean addToLogTable(OrderDetlPakin OrderDetlPakin);
+
+ boolean increaseQtyByOrderNo(String orderNo, String matnr, String batch, Double qty);
+
+ /**
+ * 鍏ュ嚭搴撲换鍔＄敓鎴愭椂锛屾洿鏂板崟鎹〃涓綔涓氭暟閲�
+ *
+ * @param orderId
+ * @param matnr
+ * @param batch
+ * @param workQty
+ * @return
+ */
+ boolean increaseWorkQty(Long orderId, String matnr, String batch, Double workQty);
+
+ boolean increaseWorkQtyById(Long id, Double workQty);
+}
diff --git a/src/main/java/com/zy/asrs/service/OrderDetlService.java b/src/main/java/com/zy/asrs/service/OrderDetlPakoutService.java
similarity index 94%
rename from src/main/java/com/zy/asrs/service/OrderDetlService.java
rename to src/main/java/com/zy/asrs/service/OrderDetlPakoutService.java
index dc4a581..bf8564d 100644
--- a/src/main/java/com/zy/asrs/service/OrderDetlService.java
+++ b/src/main/java/com/zy/asrs/service/OrderDetlPakoutService.java
@@ -6,7 +6,7 @@
import java.util.List;
-public interface OrderDetlService extends IService<OrderDetlPakout> {
+public interface OrderDetlPakoutService extends IService<OrderDetlPakout> {
List<OrderDetlPakout> selectByOrderId(Long orderId);
diff --git a/src/main/java/com/zy/asrs/service/OrderService.java b/src/main/java/com/zy/asrs/service/OrderPakinService.java
similarity index 70%
rename from src/main/java/com/zy/asrs/service/OrderService.java
rename to src/main/java/com/zy/asrs/service/OrderPakinService.java
index 0d256c0..f486e60 100644
--- a/src/main/java/com/zy/asrs/service/OrderService.java
+++ b/src/main/java/com/zy/asrs/service/OrderPakinService.java
@@ -1,18 +1,15 @@
package com.zy.asrs.service;
import com.baomidou.mybatisplus.service.IService;
-import com.zy.asrs.entity.OrderDetlPakout;
-import com.zy.asrs.entity.OrderPakin;
-import com.zy.asrs.entity.WrkDetl;
-import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.entity.*;
import java.util.List;
-public interface OrderService extends IService<OrderPakin> {
+public interface OrderPakinService extends IService<OrderPakin> {
OrderPakin selectByNo(String orderNo);
- List<OrderDetlPakout> selectWorkingDetls(Long orderId);
+ List<OrderDetlPakin> selectWorkingDetls(Long orderId);
boolean updateSettle(Long orderId, Long settle, Long userId);
diff --git a/src/main/java/com/zy/asrs/service/OrderPakoutService.java b/src/main/java/com/zy/asrs/service/OrderPakoutService.java
new file mode 100644
index 0000000..d95143a
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/OrderPakoutService.java
@@ -0,0 +1,34 @@
+package com.zy.asrs.service;
+
+import com.baomidou.mybatisplus.service.IService;
+import com.zy.asrs.entity.*;
+
+import java.util.List;
+
+public interface OrderPakoutService extends IService<OrderPakout> {
+
+ OrderPakout selectByNo(String orderNo);
+
+ List<OrderDetlPakout> selectWorkingDetls(Long orderId);
+
+ boolean updateSettle(Long orderId, Long settle, Long userId);
+
+ void checkComplete(String orderNo);
+
+ boolean saveHandlerOrder(Boolean pakin, WrkMast wrkMast, List<WrkDetl> wrkDetls);
+
+ void remove(Long orderId);
+
+ List<OrderPakout> selectComplete();
+
+ List<OrderPakout> selectComplete8();
+
+ boolean addToLogTable(OrderPakout order);
+
+ List<OrderPakout> selectorderNoL(String orderNo);
+
+ OrderPakout selectOrderMoveStatus();
+
+ OrderPakout selectOrderMoveStatusInitial();
+
+}
diff --git a/src/main/java/com/zy/asrs/service/OrderReportService.java b/src/main/java/com/zy/asrs/service/OrderReportService.java
new file mode 100644
index 0000000..3aa1aa0
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/OrderReportService.java
@@ -0,0 +1,11 @@
+package com.zy.asrs.service;
+
+import com.baomidou.mybatisplus.service.IService;
+import com.zy.asrs.entity.*;
+
+import java.util.List;
+
+public interface OrderReportService extends IService<OrderReport> {
+
+
+}
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index 2759dad..c35c027 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -43,9 +43,13 @@
@Autowired
private WaitPakinService waitPakinService;
@Autowired
- private OrderService orderService;
+ private OrderPakinService orderPakinService;
@Autowired
- private OrderDetlService orderDetlService;
+ private OrderPakoutService orderPakoutService;
+ @Autowired
+ private OrderDetlPakoutService orderDetlPakoutService;
+ @Autowired
+ private OrderDetlPakinService orderDetlPakinService;
@Autowired
private BasDevpService basDevpService;
@Autowired
@@ -301,7 +305,7 @@
// 鍏宠仈缁勬墭
} else {
- OrderPakin order = orderService.selectOne(new EntityWrapper<OrderPakin>().eq("order_no", param.getOrderNo()));
+ OrderPakin order = orderPakinService.selectOne(new EntityWrapper<OrderPakin>().eq("order_no", param.getOrderNo()));
if (Cools.isEmpty(order) || order.getSettle() > 2) {
throw new CoolException("鍗曟嵁缂栧彿宸茶繃鏈�");
}
@@ -310,12 +314,12 @@
param.getCombMats().forEach(elem -> {
// 璁㈠崟鏄庣粏鏁伴噺鏍￠獙
- OrderDetlPakout orderDetlPakout = orderDetlService.selectById(elem.getDetlId());
+ OrderDetlPakin orderDetlPakout = orderDetlPakinService.selectById(elem.getDetlId());
if (elem.getAnfme() > orderDetlPakout.getEnableQty()) {
throw new CoolException(orderDetlPakout.getMatnr() + "鍏ュ簱鏁伴噺涓嶅悎娉�");
}
// 淇敼璁㈠崟浣滀笟鏁伴噺
- if (!orderDetlService.increaseWorkQtyById(orderDetlPakout.getId(), elem.getAnfme())) {
+ if (!orderDetlPakinService.increaseWorkQtyById(orderDetlPakout.getId(), elem.getAnfme())) {
throw new CoolException("淇敼鍗曟嵁浣滀笟鏁伴噺澶辫触");
}
@@ -342,7 +346,7 @@
}
});
- orderService.updateSettle(order.getId(), 2L, userId);
+ orderPakinService.updateSettle(order.getId(), 2L, userId);
}
}
@@ -358,7 +362,7 @@
if (param.getCombMats().stream().anyMatch(obj -> obj.getAnfme() == null)) {
throw new CoolException("鍏ュ簱鐗╂枡鏁伴噺涓嶈兘涓虹┖");
}
- OrderPakin order = orderService.selectByNo(param.getOrderNo());
+ OrderPakin order = orderPakinService.selectByNo(param.getOrderNo());
if (Cools.isEmpty(order) || order.getSettle() > 2) {
throw new CoolException("鍗曟嵁缂栧彿宸茶繃鏈�");
}
@@ -384,7 +388,7 @@
Date now = new Date();
for (CombParam.CombMat combMat : param.getCombMats()) {
// 璁㈠崟鏄庣粏鏁伴噺鏍￠獙
- OrderDetlPakout orderDetlPakout = orderDetlService.selectItem(order.getId(), combMat.getMatnr(), combMat.getBatch());
+ OrderDetlPakin orderDetlPakout = orderDetlPakinService.selectItem(order.getId(), combMat.getMatnr(), combMat.getBatch());
if (Cools.isEmpty(orderDetlPakout)) {
throw new CoolException("璇ュ崟鎹腑鏈壘鍒板搴旂墿鏂欐槑缁�");
}
@@ -392,7 +396,7 @@
throw new CoolException(orderDetlPakout.getMatnr() + "鍏ュ簱鏁伴噺涓嶅悎娉�");
}
// 淇敼璁㈠崟浣滀笟鏁伴噺
- if (!orderDetlService.increaseWorkQty(order.getId(), combMat.getMatnr(), combMat.getBatch(), combMat.getAnfme())) {
+ if (!orderDetlPakinService.increaseWorkQty(order.getId(), combMat.getMatnr(), combMat.getBatch(), combMat.getAnfme())) {
throw new CoolException("淇敼鍗曟嵁浣滀笟鏁伴噺澶辫触");
}
@@ -515,12 +519,12 @@
BasDevp sta = basDevpService.checkSiteStatus(staNo);
//鏍规嵁璁㈠崟鍙风敓鎴愬嚭搴撲换鍔″伐浣滄。
- OrderPakin order = orderService.selectOne(new EntityWrapper<OrderPakin>().eq("order_no", orderNo));
+ OrderPakout order = orderPakoutService.selectOne(new EntityWrapper<OrderPakout>().eq("order_no", orderNo));
if (order.getSettle() != 1 && order.getSettle() != 2) {
throw new CoolException("璇ヨ鍗曞凡澶勭悊");
}
- List<OrderDetlPakout> orderDetlPakouts = orderDetlService.selectList(new EntityWrapper<OrderDetlPakout>().eq("order_no", orderNo));
+ List<OrderDetlPakout> orderDetlPakouts = orderDetlPakoutService.selectList(new EntityWrapper<OrderDetlPakout>().eq("order_no", orderNo));
Date now = new Date();
for (OrderDetlPakout orderDetlPakout : orderDetlPakouts) {
//鏌ヨ鎵�鏈夊簱浣嶇姸鎬佷负F鐨勫簱浣嶄俊鎭�
@@ -553,7 +557,7 @@
order.setSettle(2L);
order.setUpdateBy(userId);
order.setUpdateTime(now);
- if (!orderService.update(order, new EntityWrapper<OrderPakin>().eq("order_no", orderNo))) {
+ if (!orderPakoutService.update(order, new EntityWrapper<OrderPakout>().eq("order_no", orderNo))) {
throw new CoolException("鏇存柊璁㈠崟鐘舵�佸け璐�");
}
orderDetlPakout.setWorkQty(orderDetlPakout.getWorkQty() + curOutQty);
@@ -563,7 +567,7 @@
if (!Cools.isEmpty(orderDetlPakout.getBatch())) {
wrapper.eq("batch", orderDetlPakout.getBatch());
}
- if (!orderDetlService.update(orderDetlPakout, wrapper)) {
+ if (!orderDetlPakoutService.update(orderDetlPakout, wrapper)) {
throw new CoolException("鏇存柊璁㈠崟鏄庣粏澶辫触");
}
}
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 5456a63..9fa3537 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -11,7 +11,6 @@
import com.zy.asrs.entity.result.StockVo;
import com.zy.asrs.mapper.TagMapper;
import com.zy.asrs.service.*;
-import com.zy.asrs.utils.MatUtils;
import com.zy.common.model.DetlDto;
import com.zy.common.utils.NodeUtils;
import lombok.extern.slf4j.Slf4j;
@@ -31,9 +30,13 @@
public class OpenServiceImpl implements OpenService {
@Autowired
- private OrderService orderService;
+ private OrderPakinService orderPakinService;
@Autowired
- private OrderDetlService orderDetlService;
+ private OrderDetlPakinService orderDetlPakinService;
+ @Autowired
+ private OrderPakoutService orderPakoutService;
+ @Autowired
+ private OrderDetlPakoutService orderDetlPakoutService;
@Autowired
private SnowflakeIdWorker snowflakeIdWorker;
@Autowired
@@ -67,13 +70,13 @@
public void pakinOrderCreate(OpenOrderPakinParam param) {
callApiLogSaveOrder(param, "鍏ュ簱鍗�", true);
- OrderPakin order = orderService.selectByNo(param.getOrderNo());
+ OrderPakin order = orderPakinService.selectByNo(param.getOrderNo());
if (!Cools.isEmpty(order) && order.getSettle() != 1) {
throw new CoolException(param.getOrderNo() + "鍗曟嵁宸叉湁宸ヤ綔浠诲姟");
}
if (!Cools.isEmpty(order)) {
- boolean orderNo = orderService.delete(new EntityWrapper<OrderPakin>().eq("order_no", param.getOrderNo()));
- boolean orderNo1 = orderDetlService.delete(new EntityWrapper<OrderDetlPakout>().eq("order_no", param.getOrderNo()));
+ boolean orderNo = orderPakinService.delete(new EntityWrapper<OrderPakin>().eq("order_no", param.getOrderNo()));
+ boolean orderNo1 = orderDetlPakinService.delete(new EntityWrapper<OrderDetlPakin>().eq("order_no", param.getOrderNo()));
}
DocType docType;
@@ -120,8 +123,7 @@
now, // 淇敼鏃堕棿
null // 澶囨敞
);
- //order.setShipCode(String.valueOf(param.getDetails().get(0).getQuality()));
- if (!orderService.insert(order)) {
+ if (!orderPakinService.insert(order)) {
throw new CoolException("鐢熸垚鍗曟嵁涓绘。澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
// 鍗曟嵁鏄庣粏妗�
@@ -144,7 +146,7 @@
if (Cools.isEmpty(mat)) {
throw new CoolException(detlDto.getMatnr() + "缂栧彿鍟嗗搧妫�绱㈠け璐ワ紝璇峰厛娣诲姞鍟嗗搧");
}
- OrderDetlPakout orderDetlPakout = new OrderDetlPakout();
+ OrderDetlPakin orderDetlPakout = new OrderDetlPakin();
orderDetlPakout.sync(mat);
orderDetlPakout.setBatch(detlDto.getBatch());
orderDetlPakout.setAnfme(detlDto.getAnfme());
@@ -167,7 +169,7 @@
orderDetlPakout.setTemp3(detlDto.getTemp3());
orderDetlPakout.setTemp4(detlDto.getTemp4());
orderDetlPakout.setInspect(detlDto.getQuality());
- if (!orderDetlService.insert(orderDetlPakout)) {
+ if (!orderDetlPakinService.insert(orderDetlPakout)) {
throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
}
@@ -176,43 +178,43 @@
@Override
@Transactional
public List<OpenOrderCompeteResult> pakinOrderComplete(OpenOrderCompleteParam param) {
- callApiLogSaveOrder(param, "鍑哄簱鍗�", true);
+ callApiLogSaveOrder(param, "鍏ュ簱鍗�", true);
List<OpenOrderCompeteResult> results = new ArrayList<>();
if (!Cools.isEmpty(param) && !Cools.isEmpty(param.getOrderNo())) {
// 鎸囧畾璁㈠崟
- OrderPakin order = orderService.selectByNo(param.getOrderNo());
+ OrderPakin order = orderPakinService.selectByNo(param.getOrderNo());
if (null != order) {
OpenOrderCompeteResult result = new OpenOrderCompeteResult();
results.add(result);
result.setOrderNo(order.getOrderNo());
result.setOrderTime(order.getOrderTime());
result.setOrderType(order.getDocType$());
- List<OrderDetlPakout> orderDetlPakouts = orderDetlService.selectByOrderId(order.getId());
- for (OrderDetlPakout orderDetlPakout : orderDetlPakouts) {
+ List<OrderDetlPakin> orderDetlPakouts = orderDetlPakinService.selectByOrderId(order.getId());
+ for (OrderDetlPakin orderDetlPakout : orderDetlPakouts) {
result.getOrderDetails().add(new DetlDto(orderDetlPakout.getOrderNo(), orderDetlPakout.getMatnr(), orderDetlPakout.getBatch(), orderDetlPakout.getQty()));
}
if (order.getSettle() == 4L) {
// 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
- if (!orderService.updateSettle(order.getId(), 6L, null)) {
+ if (!orderPakinService.updateSettle(order.getId(), 6L, null)) {
throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
}
}
}
} else {
// 鎵�鏈夎鍗�
- List<OrderPakin> orders = orderService.selectList(new EntityWrapper<OrderPakin>().eq("settle", 4L));
+ List<OrderPakin> orders = orderPakinService.selectList(new EntityWrapper<OrderPakin>().eq("settle", 4L));
for (OrderPakin order : orders) {
OpenOrderCompeteResult result = new OpenOrderCompeteResult();
results.add(result);
result.setOrderNo(order.getOrderNo());
result.setOrderTime(order.getOrderTime());
result.setOrderType(order.getDocType$());
- List<OrderDetlPakout> orderDetlPakouts = orderDetlService.selectByOrderId(order.getId());
- for (OrderDetlPakout orderDetlPakout : orderDetlPakouts) {
+ List<OrderDetlPakin> orderDetlPakouts = orderDetlPakinService.selectByOrderId(order.getId());
+ for (OrderDetlPakin orderDetlPakout : orderDetlPakouts) {
result.getOrderDetails().add(new DetlDto(orderDetlPakout.getOrderNo(), orderDetlPakout.getMatnr(), orderDetlPakout.getBatch(), orderDetlPakout.getQty()));
}
// 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
- if (!orderService.updateSettle(order.getId(), 6L, null)) {
+ if (!orderPakinService.updateSettle(order.getId(), 6L, null)) {
throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
}
}
@@ -224,13 +226,13 @@
@Transactional
public void pakoutOrderCreate(OpenOrderPakoutParam param) {
callApiLogSaveOrder(param, "鍑哄簱鍗�", true);
- OrderPakin order = orderService.selectByNo(param.getOrderNo());
+ OrderPakout order = orderPakoutService.selectByNo(param.getOrderNo());
// 濡傛灉鍗曟嵁涓嶅瓨鍦ㄥ垯娣诲姞锛涘鏋滃崟鎹瓨鍦紝浣滀笟涓棤娉曚慨鏀癸紝鍙嶄箣鍒欎慨鏀瑰崟鎹�
if (!Cools.isEmpty(order)) {
if (order.getSettle() > 1L) {
throw new CoolException(param.getOrderNo() + "姝ｅ湪鍑哄簱锛屾棤娉曚慨鏀瑰崟鎹�");
}
- orderService.remove(order.getId());
+ orderPakoutService.remove(order.getId());
}
DocType docType;
if (param.getOrderType().equals("璋冩嫧鍗�")) {
@@ -240,7 +242,7 @@
}
Date now = new Date();
// 鍗曟嵁涓绘。
- order = new OrderPakin(
+ order = new OrderPakout(
String.valueOf(snowflakeIdWorker.nextId()), // 缂栧彿[闈炵┖]
param.getOrderNo(), // 璁㈠崟缂栧彿
param.getInboundDate(), // 鍗曟嵁鏃ユ湡
@@ -277,7 +279,7 @@
null // 澶囨敞
);
order.setShipCode(param.getQuality());
- if (!orderService.insert(order)) {
+ if (!orderPakoutService.insert(order)) {
throw new CoolException("鐢熸垚鍗曟嵁涓绘。澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
// 鍗曟嵁鏄庣粏妗�
@@ -322,7 +324,7 @@
orderDetlPakout.setTemp2(detlDto.getTemp2());
orderDetlPakout.setTemp3(detlDto.getTemp3());
orderDetlPakout.setTemp4(detlDto.getTemp4());
- if (!orderDetlService.insert(orderDetlPakout)) {
+ if (!orderDetlPakoutService.insert(orderDetlPakout)) {
throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
}
@@ -333,39 +335,39 @@
List<OpenOrderCompeteResult> results = new ArrayList<>();
if (!Cools.isEmpty(param) && !Cools.isEmpty(param.getOrderNo())) {
// 鎸囧畾璁㈠崟
- OrderPakin order = orderService.selectByNo(param.getOrderNo());
+ OrderPakout order = orderPakoutService.selectByNo(param.getOrderNo());
if (null != order) {
OpenOrderCompeteResult result = new OpenOrderCompeteResult();
results.add(result);
result.setOrderNo(order.getOrderNo());
result.setOrderTime(order.getOrderTime());
result.setOrderType(order.getDocType$());
- List<OrderDetlPakout> orderDetlPakouts = orderDetlService.selectByOrderId(order.getId());
+ List<OrderDetlPakout> orderDetlPakouts = orderDetlPakoutService.selectByOrderId(order.getId());
for (OrderDetlPakout orderDetlPakout : orderDetlPakouts) {
result.getOrderDetails().add(new DetlDto(orderDetlPakout.getOrderNo(), orderDetlPakout.getMatnr(), orderDetlPakout.getBatch(), orderDetlPakout.getQty()));
}
if (order.getSettle() == 4L) {
// 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
- if (!orderService.updateSettle(order.getId(), 6L, null)) {
+ if (!orderPakoutService.updateSettle(order.getId(), 6L, null)) {
throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
}
}
}
} else {
// 鎵�鏈夎鍗�
- List<OrderPakin> orders = orderService.selectList(new EntityWrapper<OrderPakin>().eq("settle", 4L));
- for (OrderPakin order : orders) {
+ List<OrderPakout> orders = orderPakoutService.selectList(new EntityWrapper<OrderPakout>().eq("settle", 4L));
+ for (OrderPakout order : orders) {
OpenOrderCompeteResult result = new OpenOrderCompeteResult();
results.add(result);
result.setOrderNo(order.getOrderNo());
result.setOrderTime(order.getOrderTime());
result.setOrderType(order.getDocType$());
- List<OrderDetlPakout> orderDetlPakouts = orderDetlService.selectByOrderId(order.getId());
+ List<OrderDetlPakout> orderDetlPakouts = orderDetlPakoutService.selectByOrderId(order.getId());
for (OrderDetlPakout orderDetlPakout : orderDetlPakouts) {
result.getOrderDetails().add(new DetlDto(orderDetlPakout.getOrderNo(), orderDetlPakout.getMatnr(), orderDetlPakout.getBatch(), orderDetlPakout.getQty()));
}
// 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
- if (!orderService.updateSettle(order.getId(), 6L, null)) {
+ if (!orderPakoutService.updateSettle(order.getId(), 6L, null)) {
throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
}
}
@@ -378,7 +380,6 @@
public List<StockVo> queryStock() {
return locDetlService.queryStockTotal();
}
-
@Override
@@ -490,35 +491,6 @@
}
}
-
- //Tag tag = tagService.selectOne(new EntityWrapper<Tag>().eq("memo", matParam.getTagId()));
-// if (tag == null) {
-// throw new CoolException("鍑洪敊锛屾湭鎵惧埌鍒嗙被");
-// }
-// if (mat == null) {
-// mat = new Mat();
-// mat.sync(matParam);
-//// mat.setMatnr(param.getMatnr());
-//// mat.setMaktx(param.getMaktx());
-//// mat.setSpecs(param.getSpecs());
-//// mat.setModel(param.getModel());
-//
-// mat.setTagId(tag.getId());
-// mat.setStatus(1);
-// mat.setCreateTime(now);
-// mat.setUpdateTime(now);
-// if (!matService.insert(mat)) {
-// throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
-// } else {
-// log.info("鍚屾鏂扮墿鏂橻鍟嗗搧缂栧彿锛歿}]", mat.getMatnr());
-// }
-// } else {
-// mat.sync(matParam);
-// mat.setTagId(tag.getId());
-// if (!matService.update(mat, new EntityWrapper<Mat>().eq("matnr",matParam.getMatnr()))) {
-// throw new CoolException("鏇存柊宸插瓨鍦ㄥ晢鍝佷俊鎭け璐ワ紝璇疯仈绯荤鐞嗗憳");
-// }
-// }
}
}
@@ -539,7 +511,7 @@
if (wrkDetlLog.getOrderNo() != null && !wrkDetlLog.getOrderNo().isEmpty()) {
LocDetlByTimeDTO locDetlByTimeDTO = new LocDetlByTimeDTO();
if (!Cools.isEmpty(wrkDetlLog.getOrderNo())) {
- OrderPakin order = orderService.selectByNo(wrkDetlLog.getOrderNo());
+ OrderPakout order = orderPakoutService.selectByNo(wrkDetlLog.getOrderNo());
if (!Cools.isEmpty(order)) {
locDetlByTimeDTO.setDate(order.getOrderTime());
locDetlByTimeDTO.setWarehouse(order.getItemName());
@@ -560,26 +532,6 @@
}
});
-// if (!Cools.isEmpty(locDetls)) {
-// for (LocDetl locDetl : locDetls) {
-//
-// if (!Cools.isEmpty(locDetl.getOrderNo())){
-// Order order = orderService.selectByNo(locDetl.getOrderNo());
-// if (!Cools.isEmpty(order)) {
-// locDetlByTimeDTO.setDate(order.getOrderTime());
-// locDetlByTimeDTO.setWarehouse(order.getItemName());
-// locDetlByTimeDTO.setOrderType(order.getDocType().toString());
-// }
-// }
-//
-// locDetlByTimeDTO.setMatnr(locDetl.getMatnr());
-// locDetlByTimeDTO.setLocNo(locDetl.getLocNo());
-// locDetlByTimeDTO.setBatch(locDetl.getBatch());
-// locDetlByTimeDTO.setAnfme(locDetl.getAnfme());
-// locDetlByTimeDTO.setOrderNo(locDetl.getOrderNo());
-// locDetlByTimeDTOS.add(locDetlByTimeDTO);
-// }
-// }
return locDetlByTimeDTOS;
}
@@ -725,18 +677,38 @@
@Transactional
@Override
- public void orderDelete(String orderNo) {
- OrderPakin order = orderService.selectByNo(orderNo);
+ public void orderPakinDelete(String orderNo) {
+ OrderPakin order = orderPakinService.selectByNo(orderNo);
if (order == null) {
throw new CoolException("鏈煡璇㈠埌瀵瑰簲璁㈠崟淇℃伅");
}
if (order.getSettle() != 1) {
throw new CoolException("璇ヨ鍗曞凡鏈夊搴斾换鍔★紝绂佹鍒犻櫎");
}
- List<OrderDetlPakout> OrderDetlPakout = orderDetlService.selectList(new EntityWrapper<OrderDetlPakout>().eq("order_no", orderNo));
+ List<OrderDetlPakout> OrderDetlPakout = orderDetlPakoutService.selectList(new EntityWrapper<OrderDetlPakout>().eq("order_no", orderNo));
if (!Cools.isEmpty(OrderDetlPakout)) {
- orderDetlService.delete(new EntityWrapper<OrderDetlPakout>().eq("order_no", orderNo));
+ orderDetlPakinService.delete(new EntityWrapper<OrderDetlPakin>().eq("order_no", orderNo));
}
- orderService.delete(new EntityWrapper<OrderPakin>().eq("order_no", orderNo));
+ orderPakinService.delete(new EntityWrapper<OrderPakin>().eq("order_no", orderNo));
+
+
+ }
+
+ @Transactional
+ @Override
+ public void orderPakoutDelete(String orderNo) {
+
+ OrderPakout orderPakout = orderPakoutService.selectByNo(orderNo);
+ if (orderPakout == null) {
+ throw new CoolException("鏈煡璇㈠埌瀵瑰簲璁㈠崟淇℃伅");
+ }
+ if (orderPakout.getSettle() != 1) {
+ throw new CoolException("璇ヨ鍗曞凡鏈夊搴斾换鍔★紝绂佹鍒犻櫎");
+ }
+ List<OrderDetlPakout> orderDetlPakins = orderDetlPakoutService.selectList(new EntityWrapper<OrderDetlPakout>().eq("order_no", orderNo));
+ if (!Cools.isEmpty(orderDetlPakins)) {
+ orderDetlPakoutService.delete(new EntityWrapper<OrderDetlPakout>().eq("order_no", orderNo));
+ }
+ orderPakoutService.delete(new EntityWrapper<OrderPakout>().eq("order_no", orderNo));
}
}
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderDetlPakinServiceImpl.java
similarity index 64%
copy from src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
copy to src/main/java/com/zy/asrs/service/impl/OrderDetlPakinServiceImpl.java
index 1d224ff..2a558dc 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderDetlPakinServiceImpl.java
@@ -4,44 +4,44 @@
import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.core.common.Cools;
-import com.zy.asrs.entity.OrderDetlPakout;
-import com.zy.asrs.mapper.OrderDetlMapper;
-import com.zy.asrs.service.OrderDetlService;
+import com.zy.asrs.entity.OrderDetlPakin;
+import com.zy.asrs.mapper.OrderDetlPakinMapper;
+import com.zy.asrs.service.OrderDetlPakinService;
import org.springframework.stereotype.Service;
import java.util.List;
-@Service("orderDetlService")
-public class OrderDetlServiceImpl extends ServiceImpl<OrderDetlMapper, OrderDetlPakout> implements OrderDetlService {
+@Service("orderDetlPakinService")
+public class OrderDetlPakinServiceImpl extends ServiceImpl<OrderDetlPakinMapper, OrderDetlPakin> implements OrderDetlPakinService {
@Override
- public List<OrderDetlPakout> selectByOrderId(Long orderId) {
- return this.selectList(new EntityWrapper<OrderDetlPakout>().eq("order_id", orderId));
+ public List<OrderDetlPakin> selectByOrderId(Long orderId) {
+ return this.selectList(new EntityWrapper<OrderDetlPakin>().eq("order_id", orderId));
}
@Override
- public Page<OrderDetlPakout> getPakoutPage(Page<OrderDetlPakout> page) {
+ public Page<OrderDetlPakin> getPakoutPage(Page<OrderDetlPakin> page) {
page.setRecords(baseMapper.getPakoutPage(page.getCondition()));
page.setTotal(baseMapper.getPakoutPageCount(page.getCondition()));
return page;
}
@Override
- public OrderDetlPakout selectItem(Long orderId, String matnr, String batch) {
+ public OrderDetlPakin selectItem(Long orderId, String matnr, String batch) {
return this.baseMapper.selectItem(orderId, matnr, batch);
}
@Override
- public OrderDetlPakout selectItem(String orderNo, String matnr, String batch) {
+ public OrderDetlPakin selectItem(String orderNo, String matnr, String batch) {
return this.baseMapper.selectItemByOrderNo(orderNo, matnr, batch);
}
@Override
- public OrderDetlPakout findByLook(List<OrderDetlPakout> orderDetlPakouts, Long orderId, String matnr, String batch) {
- for (OrderDetlPakout orderDetlPakout : orderDetlPakouts) {
- if (orderDetlPakout.getOrderId().equals(orderId) && orderDetlPakout.getMatnr().equals(matnr)) {
- if (Cools.eq(batch, orderDetlPakout.getBatch())) {
- return orderDetlPakout;
+ public OrderDetlPakin findByLook(List<OrderDetlPakin> OrderDetlPakins, Long orderId, String matnr, String batch) {
+ for (OrderDetlPakin OrderDetlPakin : OrderDetlPakins) {
+ if (OrderDetlPakin.getOrderId().equals(orderId) && OrderDetlPakin.getMatnr().equals(matnr)) {
+ if (Cools.eq(batch, OrderDetlPakin.getBatch())) {
+ return OrderDetlPakin;
}
}
}
@@ -69,8 +69,8 @@
}
@Override
- public boolean addToLogTable(OrderDetlPakout orderDetlPakout) {
- return this.baseMapper.addToLogTable(orderDetlPakout) > 0;
+ public boolean addToLogTable(OrderDetlPakin OrderDetlPakin) {
+ return this.baseMapper.addToLogTable(OrderDetlPakin) > 0;
}
@Override
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderDetlPakoutServiceImpl.java
similarity index 91%
rename from src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
rename to src/main/java/com/zy/asrs/service/impl/OrderDetlPakoutServiceImpl.java
index 1d224ff..2117103 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderDetlPakoutServiceImpl.java
@@ -5,14 +5,14 @@
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.core.common.Cools;
import com.zy.asrs.entity.OrderDetlPakout;
-import com.zy.asrs.mapper.OrderDetlMapper;
-import com.zy.asrs.service.OrderDetlService;
+import com.zy.asrs.mapper.OrderDetlPakoutMapper;
+import com.zy.asrs.service.OrderDetlPakoutService;
import org.springframework.stereotype.Service;
import java.util.List;
-@Service("orderDetlService")
-public class OrderDetlServiceImpl extends ServiceImpl<OrderDetlMapper, OrderDetlPakout> implements OrderDetlService {
+@Service("orderDetlPakoutService")
+public class OrderDetlPakoutServiceImpl extends ServiceImpl<OrderDetlPakoutMapper, OrderDetlPakout> implements OrderDetlPakoutService {
@Override
public List<OrderDetlPakout> selectByOrderId(Long orderId) {
@@ -81,7 +81,7 @@
/**
* 鍏ュ嚭搴撲换鍔＄敓鎴愭椂锛屾洿鏂板崟鎹〃涓綔涓氭暟閲�
*
- * @param orderId
+ * @param id
* @param matnr
* @param batch
* @param workQty
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderPakinServiceImpl.java
similarity index 75%
copy from src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
copy to src/main/java/com/zy/asrs/service/impl/OrderPakinServiceImpl.java
index 6214367..03e3472 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderPakinServiceImpl.java
@@ -9,8 +9,8 @@
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.OpenOrderPakinParam;
import com.zy.asrs.entity.param.OpenOrderPakoutParam;
-import com.zy.asrs.mapper.OrderDetlMapper;
-import com.zy.asrs.mapper.OrderMapper;
+import com.zy.asrs.mapper.OrderDetlPakinMapper;
+import com.zy.asrs.mapper.OrderPakinMapper;
import com.zy.asrs.service.*;
import com.zy.common.model.DetlDto;
import lombok.extern.slf4j.Slf4j;
@@ -21,17 +21,17 @@
import java.util.List;
@Slf4j
-@Service("orderService")
-public class OrderServiceImpl extends ServiceImpl<OrderMapper, OrderPakin> implements OrderService {
+@Service("orderPakinService")
+public class OrderPakinServiceImpl extends ServiceImpl<OrderPakinMapper, OrderPakin> implements OrderPakinService {
@Autowired
- private OrderDetlMapper orderDetlMapper;
+ private OrderDetlPakinMapper orderDetlMapper;
@Autowired
private OpenService openService;
@Autowired
private SnowflakeIdWorker snowflakeIdWorker;
@Autowired
- private OrderDetlService orderDetlService;
+ private OrderDetlPakinService orderDetlPakinService;
@Autowired
private DocTypeService docTypeService;
@Autowired
@@ -47,7 +47,7 @@
}
@Override
- public List<OrderDetlPakout> selectWorkingDetls(Long orderId) {
+ public List<OrderDetlPakin> selectWorkingDetls(Long orderId) {
return orderDetlMapper.selectWorkingDetls(orderId);
}
@@ -62,10 +62,10 @@
if (Cools.isEmpty(order) || order.getSettle() >= 4L) {
return;
}
- List<OrderDetlPakout> orderDetlPakouts = orderDetlMapper.selectList(new EntityWrapper<OrderDetlPakout>().eq("order_id", order.getId()));
+ List<OrderDetlPakin> OrderDetlPakins = orderDetlMapper.selectList(new EntityWrapper<OrderDetlPakin>().eq("order_id", order.getId()));
boolean complete = true;
- for (OrderDetlPakout orderDetlPakout : orderDetlPakouts) {
- if (orderDetlPakout.getAnfme() > orderDetlPakout.getQty()) {
+ for (OrderDetlPakin OrderDetlPakin : OrderDetlPakins) {
+ if (OrderDetlPakin.getAnfme() > OrderDetlPakin.getQty()) {
complete = false;
break;
}
@@ -74,22 +74,22 @@
// 鍑哄簱璁㈠崟閲嶆柊鏁寸悊鏄庣粏
DocType docType = docTypeService.selectById(order.getDocType());
if (null != docType && docType.getPakout() == 1) {
- if (!orderDetlService.delete(new EntityWrapper<OrderDetlPakout>().eq("order_id", order.getId()))) {
+ if (!orderDetlPakinService.delete(new EntityWrapper<OrderDetlPakin>().eq("order_id", order.getId()))) {
throw new CoolException("閲嶆暣鍑哄簱璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戞槑缁嗗け璐�");
}
List<WrkDetl> wrkDetls = wrkDetlService.selectAndLogByOrderNo(orderNo);
for (WrkDetl wrkDetl : wrkDetls) {
- OrderDetlPakout orderDetlPakout = new OrderDetlPakout();
- orderDetlPakout.sync(wrkDetl);
- orderDetlPakout.setQty(orderDetlPakout.getAnfme());
- orderDetlPakout.setOrderId(order.getId());
- orderDetlPakout.setOrderNo(orderNo);
- orderDetlPakout.setStatus(1);
- orderDetlPakout.setCreateTime(order.getCreateTime());
- orderDetlPakout.setCreateBy(order.getCreateBy());
- orderDetlPakout.setUpdateTime(order.getUpdateTime());
- orderDetlPakout.setUpdateBy(order.getUpdateBy());
- if (!orderDetlService.insert(orderDetlPakout)) {
+ OrderDetlPakin OrderDetlPakin = new OrderDetlPakin();
+ OrderDetlPakin.sync(wrkDetl);
+ OrderDetlPakin.setQty(OrderDetlPakin.getAnfme());
+ OrderDetlPakin.setOrderId(order.getId());
+ OrderDetlPakin.setOrderNo(orderNo);
+ OrderDetlPakin.setStatus(1);
+ OrderDetlPakin.setCreateTime(order.getCreateTime());
+ OrderDetlPakin.setCreateBy(order.getCreateBy());
+ OrderDetlPakin.setUpdateTime(order.getUpdateTime());
+ OrderDetlPakin.setUpdateBy(order.getUpdateBy());
+ if (!orderDetlPakinService.insert(OrderDetlPakin)) {
throw new CoolException("閲嶆暣鍑哄簱璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戞槑缁嗗け璐�");
}
}
@@ -137,11 +137,11 @@
}
for (DetlDto detlDto : detlDtos) {
// 淇敼璁㈠崟鏄庣粏鏁伴噺
- if (!orderDetlService.increase(order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getAnfme())) {
+ if (!orderDetlPakinService.increase(order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getAnfme())) {
throw new CoolException("淇敼鍗曟嵁鏄庣粏鏁伴噺澶辫触");
}
// 淇敼璁㈠崟浣滀笟鏁伴噺
- if (!orderDetlService.increaseWorkQty(order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getAnfme())) {
+ if (!orderDetlPakinService.increaseWorkQty(order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getAnfme())) {
throw new CoolException("淇敼鍗曟嵁浣滀笟鏁伴噺澶辫触");
}
}
@@ -157,7 +157,7 @@
if (!this.deleteById(orderId)) {
throw new CoolException("鍒犻櫎鍗曟嵁澶辫触");
}
- orderDetlService.delete(new EntityWrapper<OrderDetlPakout>().eq("order_id", orderId));
+ orderDetlPakinService.delete(new EntityWrapper<OrderDetlPakin>().eq("order_id", orderId));
}
@Override
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderPakoutServiceImpl.java
similarity index 77%
rename from src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
rename to src/main/java/com/zy/asrs/service/impl/OrderPakoutServiceImpl.java
index 6214367..914edc5 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderPakoutServiceImpl.java
@@ -9,8 +9,8 @@
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.OpenOrderPakinParam;
import com.zy.asrs.entity.param.OpenOrderPakoutParam;
-import com.zy.asrs.mapper.OrderDetlMapper;
-import com.zy.asrs.mapper.OrderMapper;
+import com.zy.asrs.mapper.OrderDetlPakoutMapper;
+import com.zy.asrs.mapper.OrderPakoutMapper;
import com.zy.asrs.service.*;
import com.zy.common.model.DetlDto;
import lombok.extern.slf4j.Slf4j;
@@ -21,25 +21,25 @@
import java.util.List;
@Slf4j
-@Service("orderService")
-public class OrderServiceImpl extends ServiceImpl<OrderMapper, OrderPakin> implements OrderService {
+@Service("orderPakoutService")
+public class OrderPakoutServiceImpl extends ServiceImpl<OrderPakoutMapper, OrderPakout> implements OrderPakoutService {
@Autowired
- private OrderDetlMapper orderDetlMapper;
+ private OrderDetlPakoutMapper orderDetlPakoutMapper;
@Autowired
private OpenService openService;
@Autowired
private SnowflakeIdWorker snowflakeIdWorker;
@Autowired
- private OrderDetlService orderDetlService;
+ private OrderDetlPakoutService orderDetlPakoutService;
@Autowired
private DocTypeService docTypeService;
@Autowired
private WrkDetlService wrkDetlService;
@Override
- public OrderPakin selectByNo(String orderNo) {
- List<OrderPakin> orderList = this.selectList(new EntityWrapper<OrderPakin>().eq("order_no", orderNo));
+ public OrderPakout selectByNo(String orderNo) {
+ List<OrderPakout> orderList = this.selectList(new EntityWrapper<OrderPakout>().eq("order_no", orderNo));
if (Cools.isEmpty(orderList)) {
return null;
}
@@ -48,7 +48,7 @@
@Override
public List<OrderDetlPakout> selectWorkingDetls(Long orderId) {
- return orderDetlMapper.selectWorkingDetls(orderId);
+ return orderDetlPakoutMapper.selectWorkingDetls(orderId);
}
@Override
@@ -58,11 +58,11 @@
@Override
public void checkComplete(String orderNo) {
- OrderPakin order = this.selectByNo(orderNo);
+ OrderPakout order = this.selectByNo(orderNo);
if (Cools.isEmpty(order) || order.getSettle() >= 4L) {
return;
}
- List<OrderDetlPakout> orderDetlPakouts = orderDetlMapper.selectList(new EntityWrapper<OrderDetlPakout>().eq("order_id", order.getId()));
+ List<OrderDetlPakout> orderDetlPakouts = orderDetlPakoutMapper.selectList(new EntityWrapper<OrderDetlPakout>().eq("order_id", order.getId()));
boolean complete = true;
for (OrderDetlPakout orderDetlPakout : orderDetlPakouts) {
if (orderDetlPakout.getAnfme() > orderDetlPakout.getQty()) {
@@ -74,7 +74,7 @@
// 鍑哄簱璁㈠崟閲嶆柊鏁寸悊鏄庣粏
DocType docType = docTypeService.selectById(order.getDocType());
if (null != docType && docType.getPakout() == 1) {
- if (!orderDetlService.delete(new EntityWrapper<OrderDetlPakout>().eq("order_id", order.getId()))) {
+ if (!orderDetlPakoutService.delete(new EntityWrapper<OrderDetlPakout>().eq("order_id", order.getId()))) {
throw new CoolException("閲嶆暣鍑哄簱璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戞槑缁嗗け璐�");
}
List<WrkDetl> wrkDetls = wrkDetlService.selectAndLogByOrderNo(orderNo);
@@ -89,7 +89,7 @@
orderDetlPakout.setCreateBy(order.getCreateBy());
orderDetlPakout.setUpdateTime(order.getUpdateTime());
orderDetlPakout.setUpdateBy(order.getUpdateBy());
- if (!orderDetlService.insert(orderDetlPakout)) {
+ if (!orderDetlPakoutService.insert(orderDetlPakout)) {
throw new CoolException("閲嶆暣鍑哄簱璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戞槑缁嗗け璐�");
}
}
@@ -128,7 +128,7 @@
openService.pakoutOrderCreate(openParam);
}
- OrderPakin order = this.selectByNo(orderNo);
+ OrderPakout order = this.selectByNo(orderNo);
if (null == order) {
throw new CoolException("鐢熸垚鍗曟嵁澶辫触");
}
@@ -137,11 +137,11 @@
}
for (DetlDto detlDto : detlDtos) {
// 淇敼璁㈠崟鏄庣粏鏁伴噺
- if (!orderDetlService.increase(order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getAnfme())) {
+ if (!orderDetlPakoutService.increase(order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getAnfme())) {
throw new CoolException("淇敼鍗曟嵁鏄庣粏鏁伴噺澶辫触");
}
// 淇敼璁㈠崟浣滀笟鏁伴噺
- if (!orderDetlService.increaseWorkQty(order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getAnfme())) {
+ if (!orderDetlPakoutService.increaseWorkQty(order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getAnfme())) {
throw new CoolException("淇敼鍗曟嵁浣滀笟鏁伴噺澶辫触");
}
}
@@ -157,36 +157,36 @@
if (!this.deleteById(orderId)) {
throw new CoolException("鍒犻櫎鍗曟嵁澶辫触");
}
- orderDetlService.delete(new EntityWrapper<OrderDetlPakout>().eq("order_id", orderId));
+ orderDetlPakoutService.delete(new EntityWrapper<OrderDetlPakout>().eq("order_id", orderId));
}
@Override
- public List<OrderPakin> selectComplete() {
+ public List<OrderPakout> selectComplete() {
return this.baseMapper.selectComplete();
}
@Override
- public List<OrderPakin> selectComplete8() {
+ public List<OrderPakout> selectComplete8() {
return this.baseMapper.selectComplete8();
}
@Override
- public boolean addToLogTable(OrderPakin order) {
+ public boolean addToLogTable(OrderPakout order) {
return this.baseMapper.addToLogTable(order) > 0;
}
@Override
- public List<OrderPakin> selectorderNoL(String orderNo) {
+ public List<OrderPakout> selectorderNoL(String orderNo) {
return this.baseMapper.selectorderNoL(orderNo);
}
@Override
- public OrderPakin selectOrderMoveStatus() {
+ public OrderPakout selectOrderMoveStatus() {
return this.baseMapper.selectOrderMoveStatus();
}
@Override
- public OrderPakin selectOrderMoveStatusInitial() {
+ public OrderPakout selectOrderMoveStatusInitial() {
return this.baseMapper.selectOrderMoveStatusInitial();
}
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderReportServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderReportServiceImpl.java
new file mode 100644
index 0000000..ea22dfb
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/impl/OrderReportServiceImpl.java
@@ -0,0 +1,31 @@
+package com.zy.asrs.service.impl;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.core.common.Cools;
+import com.core.common.DateUtils;
+import com.core.common.SnowflakeIdWorker;
+import com.core.exception.CoolException;
+import com.zy.asrs.entity.*;
+import com.zy.asrs.entity.param.OpenOrderPakoutParam;
+import com.zy.asrs.mapper.OrderDetlPakoutMapper;
+import com.zy.asrs.mapper.OrderPakoutMapper;
+import com.zy.asrs.mapper.OrderReportMapper;
+import com.zy.asrs.service.*;
+import com.zy.common.model.DetlDto;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Slf4j
+@Service("orderReportService")
+public class OrderReportServiceImpl extends ServiceImpl<OrderReportMapper, OrderReport> implements OrderReportService {
+
+
+
+
+
+}
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index b42abae..0897fc2 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -69,9 +69,13 @@
@Autowired
private SnowflakeIdWorker snowflakeIdWorker;
@Autowired
- private OrderService orderService;
+ private OrderPakoutService orderPakoutService;
@Autowired
- private OrderDetlService orderDetlService;
+ private OrderPakinService orderPakinService;
+ @Autowired
+ private OrderDetlPakoutService orderDetlPakoutService;
+ @Autowired
+ private OrderDetlPakinService orderDetlPakinService;
@Autowired
private WcsController wcsController;
@Autowired
@@ -470,9 +474,9 @@
if (locDto.getAnfme() == null || locDto.getAnfme() <= 0.0D) {
continue;
}
- OrderDetlPakout orderDetlPakout = orderDetlService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), locDto.getBatch());
+ OrderDetlPakout orderDetlPakout = orderDetlPakoutService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), locDto.getBatch());
if (orderDetlPakout == null) {
- orderDetlPakout = orderDetlService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), null);
+ orderDetlPakout = orderDetlPakoutService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), null);
}
WrkDetl wrkDetl = new WrkDetl();
wrkDetl.sync(orderDetlPakout);
@@ -490,10 +494,10 @@
throw new CoolException("淇濆瓨宸ヤ綔妗ｆ槑缁嗗け璐�");
}
// 淇敼璁㈠崟鏄庣粏
- if (!orderDetlService.increaseWorkQtyById(orderDetlPakout.getId(), locDto.getAnfme())) {
+ if (!orderDetlPakoutService.increaseWorkQtyById(orderDetlPakout.getId(), locDto.getAnfme())) {
throw new CoolException("淇敼璁㈠崟鏄庣粏鏁伴噺澶辫触");
}
- orderService.updateSettle(orderDetlPakout.getOrderId(), 2L, userId);
+ orderPakoutService.updateSettle(orderDetlPakout.getOrderId(), 2L, userId);
}
// 淇敼搴撲綅鐘舵��: F.鍦ㄥ簱 ====>>> R.鍑哄簱棰勭害/P.鎷ｆ枡/鐩樼偣/骞舵澘鍑哄簱涓�
locMast = locMastService.selectById(taskDto.getLocNo());
@@ -578,9 +582,9 @@
if (locDto.getAnfme() == null || locDto.getAnfme() <= 0.0D) {
continue;
}
- OrderDetlPakout orderDetlPakout = orderDetlService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), locDto.getBatch());
+ OrderDetlPakout orderDetlPakout = orderDetlPakoutService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), locDto.getBatch());
if (orderDetlPakout == null) {
- orderDetlPakout = orderDetlService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), null);
+ orderDetlPakout = orderDetlPakoutService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), null);
}
WrkDetl wrkDetl = new WrkDetl();
wrkDetl.sync(orderDetlPakout);
@@ -598,10 +602,10 @@
throw new CoolException("淇濆瓨宸ヤ綔妗ｆ槑缁嗗け璐�");
}
// 淇敼璁㈠崟鏄庣粏
- if (!orderDetlService.increaseWorkQty(orderDetlPakout.getOrderId(), orderDetlPakout.getMatnr(), orderDetlPakout.getBatch(), locDto.getAnfme())) {
+ if (!orderDetlPakoutService.increaseWorkQty(orderDetlPakout.getOrderId(), orderDetlPakout.getMatnr(), orderDetlPakout.getBatch(), locDto.getAnfme())) {
throw new CoolException("淇敼璁㈠崟鏄庣粏鏁伴噺澶辫触");
}
- orderService.updateSettle(orderDetlPakout.getOrderId(), 2L, userId);
+ orderPakoutService.updateSettle(orderDetlPakout.getOrderId(), 2L, userId);
}
// 淇敼搴撲綅鐘舵��: F.鍦ㄥ簱 ====>>> R.鍑哄簱棰勭害/P.鎷ｆ枡/鐩樼偣/骞舵澘鍑哄簱涓�
locMast = locMastService.selectById(taskDto.getLocNo());
@@ -1395,26 +1399,26 @@
List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
for (WrkDetl wrkDetl : wrkDetls) {
if (!Cools.isEmpty(wrkDetl.getOrderNo())) {
- if (!orderDetlService.decrease(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getAnfme())) {
+ if (!orderDetlPakoutService.decrease(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getAnfme())) {
throw new CoolException("璁㈠崟鏁版嵁鍥炴粴澶辫触");
}
//淇敼璁㈠崟涓昏〃鐘舵��,娌℃湁浣滀笟鏁伴噺鏃舵墠鍙互淇敼
boolean flag = true;
- List<OrderDetlPakout> orderDetlPakouts = orderDetlService.selectList(new EntityWrapper<OrderDetlPakout>().eq("order_no", wrkDetl.getOrderNo()));
+ List<OrderDetlPakout> orderDetlPakouts = orderDetlPakoutService.selectList(new EntityWrapper<OrderDetlPakout>().eq("order_no", wrkDetl.getOrderNo()));
for (OrderDetlPakout orderDetlPakout : orderDetlPakouts) {
if (orderDetlPakout.getWorkQty() > 0) {
flag = false;
}
}
if (flag) {
- OrderPakin order = orderService.selectOne(new EntityWrapper<OrderPakin>().eq("order_no", wrkDetl.getOrderNo()));
+ OrderPakout order = orderPakoutService.selectOne(new EntityWrapper<OrderPakout>().eq("order_no", wrkDetl.getOrderNo()));
if (!Cools.isEmpty(order) && order.getSettle() == 2) {
order.setSettle(1L);
order.setUpdateBy(userId);
order.setUpdateTime(now);
}
- if (!orderService.update(order, new EntityWrapper<OrderPakin>().eq("order_no", wrkDetl.getOrderNo()))) {
+ if (!orderPakoutService.update(order, new EntityWrapper<OrderPakout>().eq("order_no", wrkDetl.getOrderNo()))) {
throw new CoolException("淇敼璁㈠崟鐘舵�佸け璐�");
}
}
diff --git a/src/main/java/com/zy/asrs/task/AutoLocMoveScheduler.java b/src/main/java/com/zy/asrs/task/AutoLocMoveScheduler.java
index ea0de31..692032b 100644
--- a/src/main/java/com/zy/asrs/task/AutoLocMoveScheduler.java
+++ b/src/main/java/com/zy/asrs/task/AutoLocMoveScheduler.java
@@ -33,33 +33,10 @@
@Autowired
private SlaveWmsParameterProperties slaveWmsParameterProperties;
@Autowired
- private OrderService orderService;
- @Autowired
- private OrderDetlService orderDetlService;
- @Autowired
private AutoMoveService autoMoveService;
//瀹氭椂鍑哄簱 缁忓吀鍙屼几
- @Scheduled(cron = "0/3 * * * * ? ")
- public void locToLocAutoLocMove() {
- if (slaveWmsParameterProperties.isAutoLocMoveBoolean()) {
- Config config = configService.selectConfigByCode("AutoLocMove");
- if (Cools.isEmpty(config) || config.getValue().equals("false")) {
- return;
- }
- OrderPakin order = orderService.selectOrderMoveStatus();
- if (!Cools.isEmpty(order)) {
-// autoMoveService.selectList()
- } else {
- order = orderService.selectOrderMoveStatusInitial();
- if (Cools.isEmpty(order)) {
- return;
- }
- order.setMoveStatus(2);
- orderService.updateById(order);
- }
- }
- }
+
//瀹氭椂鍑哄簱
@Scheduled(cron = "0/3 * * * * ? ")
diff --git a/src/main/java/com/zy/asrs/task/OrderMoveHistoryScheduler.java b/src/main/java/com/zy/asrs/task/OrderMoveHistoryScheduler.java
index 620995e..b8f7fa6 100644
--- a/src/main/java/com/zy/asrs/task/OrderMoveHistoryScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderMoveHistoryScheduler.java
@@ -16,6 +16,14 @@
*/
@Scheduled(cron = "0/30 * * * * ?")
public void execute() {
- orderMoveHistoryHandler.start();
+ orderMoveHistoryHandler.startPakin();
+ }
+
+ /**
+ * 灏嗗凡瀹屾垚order鍜宱rderDetl绉诲姩鍒發og琛�
+ */
+ @Scheduled(cron = "0/30 * * * * ?")
+ public void execute2() {
+ orderMoveHistoryHandler.startPakout();
}
}
diff --git a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
index 7791532..0e4033d 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -5,10 +5,7 @@
import com.zy.asrs.entity.OrderPakin;
import com.zy.asrs.entity.OrderDetlReport;
import com.zy.asrs.entity.OrderDetlReportLog;
-import com.zy.asrs.service.ApiLogService;
-import com.zy.asrs.service.OrderDetlReportLogService;
-import com.zy.asrs.service.OrderDetlReportService;
-import com.zy.asrs.service.OrderService;
+import com.zy.asrs.service.*;
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.task.handler.OrderSyncHandler;
import com.zy.common.entity.Parameter;
@@ -30,7 +27,9 @@
@Autowired
private OrderSyncHandler orderSyncHandler;
@Autowired
- private OrderService orderService;
+ private OrderPakinService orderPakinService;
+ @Autowired
+ private OrderPakoutService orderPakoutService;
@Autowired
private ApiLogService apiLogService;
@Autowired
@@ -47,7 +46,7 @@
}
}
- @Scheduled(cron = "0/30 * * * * ? ")
+ /* @Scheduled(cron = "0/30 * * * * ? ")
public void clearReportLog() {
try {
List<OrderDetlReport> orderDetls = orderDetlReportService.selectList(new EntityWrapper<OrderDetlReport>());
@@ -79,6 +78,6 @@
}
}
}
- }
+ }*/
}
diff --git a/src/main/java/com/zy/asrs/task/handler/OrderMoveHistoryHandler.java b/src/main/java/com/zy/asrs/task/handler/OrderMoveHistoryHandler.java
index bc107d2..ac57b6e 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderMoveHistoryHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderMoveHistoryHandler.java
@@ -2,14 +2,8 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
-import com.zy.asrs.entity.OrderPakin;
-import com.zy.asrs.entity.OrderDetlPakout;
-import com.zy.asrs.entity.OrderDetlReport;
-import com.zy.asrs.entity.OrderDetlReportLog;
-import com.zy.asrs.service.OrderDetlReportLogService;
-import com.zy.asrs.service.OrderDetlReportService;
-import com.zy.asrs.service.OrderDetlService;
-import com.zy.asrs.service.OrderService;
+import com.zy.asrs.entity.*;
+import com.zy.asrs.service.*;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
import lombok.extern.slf4j.Slf4j;
@@ -23,21 +17,30 @@
@Slf4j
public class OrderMoveHistoryHandler extends AbstractHandler<String> {
@Autowired
- private OrderService orderService;
+ private OrderPakoutService orderPakoutService;
@Autowired
- private OrderDetlService orderDetlService;
+ private OrderPakinService orderPakinService;
@Autowired
- private OrderDetlReportLogService orderDetlReportLogService;
+ private OrderDetlPakinService orderDetlPakinService;
+ @Autowired
+ private OrderDetlPakoutService orderDetlPakoutService;
+ @Autowired
+ private OrderReportService orderReportService;
@Autowired
private OrderDetlReportService orderDetlReportService;
+ @Autowired
+ private OrderDetlReportLogService orderDetlReportLogService;
- public ReturnT<String> start() {
- List<OrderPakin> settleEqual6 = orderService.selectList(new EntityWrapper<OrderPakin>()
+
+
+
+ public ReturnT<String> startPakin() {
+ List<OrderPakin> settleEqual6 = orderPakinService.selectList(new EntityWrapper<OrderPakin>()
.eq("settle", 6));
for (OrderPakin order : settleEqual6) {
- List<OrderDetlPakout> orderDetlPakouts = orderDetlService.selectList(new EntityWrapper<OrderDetlPakout>()
+ List<OrderDetlPakin> orderDetlPakouts = orderDetlPakinService.selectList(new EntityWrapper<OrderDetlPakin>()
.eq("order_no", order.getOrderNo()));
- moveBoth(order, orderDetlPakouts);
+ moveBothPakin(order, orderDetlPakouts);
List<OrderDetlReport> orderNo = orderDetlReportService.selectList(new EntityWrapper<OrderDetlReport>().eq("order_no", order.getOrderNo()));
for (OrderDetlReport orderDetlReport : orderNo) {
OrderDetlReportLog log = new OrderDetlReportLog();
@@ -50,24 +53,63 @@
return SUCCESS;
}
- private void moveBoth(OrderPakin order, List<OrderDetlPakout> orderDetlPakouts) {
+ private void moveBothPakin(OrderPakin order, List<OrderDetlPakin> orderDetlPakins) {
Date now = new Date();
- if (!Cools.isEmpty(orderDetlPakouts)) {
- for (OrderDetlPakout orderDetlPakout : orderDetlPakouts) {
+ if (!Cools.isEmpty(orderDetlPakins)) {
+ for (OrderDetlPakin orderDetlPakout : orderDetlPakins) {
orderDetlPakout.setUpdateBy(0L);
orderDetlPakout.setUpdateTime(now);
- orderDetlService.addToLogTable(orderDetlPakout);
- orderDetlService.delete(new EntityWrapper<OrderDetlPakout>()
+ orderDetlPakinService.addToLogTable(orderDetlPakout);
+ orderDetlPakinService.delete(new EntityWrapper<OrderDetlPakin>()
.eq("id", orderDetlPakout.getId()));
}
}
if (!Cools.isEmpty(order)) {
order.setUpdateBy(0L);
order.setUpdateTime(now);
- orderService.addToLogTable(order);
- orderService.delete(new EntityWrapper<OrderPakin>()
+ orderPakinService.addToLogTable(order);
+ orderPakinService.delete(new EntityWrapper<OrderPakin>()
.eq("id", order.getId()));
}
}
+
+ public ReturnT<String> startPakout() {
+ List<OrderPakout> settleEqual6 = orderPakoutService.selectList(new EntityWrapper<OrderPakout>()
+ .eq("settle", 6));
+ for (OrderPakout order : settleEqual6) {
+ List<OrderDetlPakout> orderDetlPakouts = orderDetlPakoutService.selectList(new EntityWrapper<OrderDetlPakout>()
+ .eq("order_no", order.getOrderNo()));
+ moveBothPakout(order, orderDetlPakouts);
+ List<OrderDetlReport> orderNo = orderDetlReportService.selectList(new EntityWrapper<OrderDetlReport>().eq("order_no", order.getOrderNo()));
+ for (OrderDetlReport orderDetlReport : orderNo) {
+ OrderDetlReportLog log = new OrderDetlReportLog();
+ log.sync(orderDetlReport);
+ orderDetlReportLogService.insert(log);
+ orderDetlReportService.deleteById(orderDetlReport);
+ }
+ log.info("宸插畬鎴愬崟鎹Щ鍔ㄨ嚦鍘嗗彶琛ㄦ垚鍔� =====>" + order);
+ }
+ return SUCCESS;
+ }
+
+ private void moveBothPakout(OrderPakout order, List<OrderDetlPakout> orderDetlPakouts) {
+ Date now = new Date();
+ if (!Cools.isEmpty(orderDetlPakouts)) {
+ for (OrderDetlPakout orderDetlPakout : orderDetlPakouts) {
+ orderDetlPakout.setUpdateBy(0L);
+ orderDetlPakout.setUpdateTime(now);
+ orderDetlPakoutService.addToLogTable(orderDetlPakout);
+ orderDetlPakoutService.delete(new EntityWrapper<OrderDetlPakout>()
+ .eq("id", orderDetlPakout.getId()));
+ }
+ }
+ if (!Cools.isEmpty(order)) {
+ order.setUpdateBy(0L);
+ order.setUpdateTime(now);
+ orderPakoutService.addToLogTable(order);
+ orderPakoutService.delete(new EntityWrapper<OrderPakout>()
+ .eq("id", order.getId()));
+ }
+ }
}
diff --git a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
index dc79eaf..a6dc007 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -21,9 +21,13 @@
@Autowired
private JdbcTemplate jdbcTemplate;
@Autowired
- private OrderService orderService;
+ private OrderPakinService orderPakinService;
@Autowired
- private OrderDetlService orderDetlService;
+ private OrderPakoutService orderPakoutService;
+ @Autowired
+ private OrderDetlPakinService orderDetlPakinService;
+ @Autowired
+ private OrderDetlPakoutService orderDetlPakoutService;
@Autowired
private OrderDetlReportService orderDetlReportService;
@Autowired
@@ -31,11 +35,6 @@
@Autowired
private DocTypeService docTypeService;
- @Value("${mes.url}")
- private String url;
-
- @Value("${mes.pakin}")
- private String pakin;
@Transactional
public ReturnT<String> start(OrderPakin order) {
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
index d72e788..4b022be 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
@@ -36,7 +36,9 @@
@Autowired
private WaitPakinLogService waitPakinLogService;
@Autowired
- private OrderService orderService;
+ private OrderPakinService orderPakinService;
+ @Autowired
+ private OrderPakoutService orderPakoutService;
@Transactional
public ReturnT<String> start(WrkMast wrkMast) {
@@ -48,7 +50,8 @@
while (iterator.hasNext()) {
WrkDetl wrkDetl = iterator.next();
if (!Cools.isEmpty(wrkDetl.getOrderNo())) {
- orderService.checkComplete(wrkDetl.getOrderNo());
+ orderPakinService.checkComplete(wrkDetl.getOrderNo());
+ orderPakoutService.checkComplete(wrkDetl.getOrderNo());
iterator.remove();
}
}
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
index f0ee7c8..25a38b5 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -32,21 +32,14 @@
@Autowired
private LocDetlService locDetlService;
@Autowired
- private WaitPakinService waitPakinService;
+ private OrderDetlPakinService orderDetlPakinService;
@Autowired
- private OrderDetlService orderDetlService;
+ private OrderDetlPakoutService orderDetlPakoutService;
@Autowired
private WorkService workService;
@Autowired
private OrderDetlReportService orderDetlReportService;
-// private static final Map<Integer,Integer> sourceSite = new HashMap<>();
-// static {
-// sourceSite.put(1041,1040);sourceSite.put(1042,1040);
-// sourceSite.put(2011,2010);sourceSite.put(2012,2010);
-// sourceSite.put(2001,2000);sourceSite.put(2002,2000);
-// sourceSite.put(3011,3010);sourceSite.put(3010,1040);
-// }
public ReturnT<String> start(WrkMast wrkMast) {
// 4.鍏ュ簱瀹屾垚
@@ -55,10 +48,6 @@
// 14.鍑哄簱瀹屾垚
} else if (wrkMast.getWrkSts() == 14) {
return doOut(wrkMast);
- } else if (wrkMast.getWrkSts() == 108) {
- return doOut2_5(wrkMast);
- } else if (wrkMast.getWrkSts() == 106) {
- return doOut2_5(wrkMast);
}
return SUCCESS;
}
@@ -138,13 +127,13 @@
}
// 鏇存柊璁㈠崟瀹屾垚鏁伴噺
- OrderDetlPakout orderDetlPakout = orderDetlService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
+ OrderDetlPakin orderDetlPakout = orderDetlPakinService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
if (orderDetlPakout == null) {
- orderDetlPakout = orderDetlService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), null);
+ orderDetlPakout = orderDetlPakinService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), null);
}
try {
if (!Cools.isEmpty(orderDetlPakout)) {
- if (!orderDetlService.increaseQtyByOrderNo(wrkDetl.getOrderNo(), wrkDetl.getMatnr(),
+ if (!orderDetlPakinService.increaseQtyByOrderNo(wrkDetl.getOrderNo(), wrkDetl.getMatnr(),
orderDetlPakout.getBatch(), wrkDetl.getAnfme())) {
// exceptionHandle("鍏ㄦ澘鍏ュ簱 ===>> 鏇存柊璁㈠崟瀹屾垚鏁伴噺澶辫触锛沎workNo={0}],[locNo={1}]",
// wrkMast.getWrkNo(), wrkMast.getLocNo());
@@ -192,13 +181,13 @@
}
// 鏇存柊璁㈠崟瀹屾垚鏁伴噺
- OrderDetlPakout orderDetlPakout = orderDetlService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
+ OrderDetlPakout orderDetlPakout = orderDetlPakoutService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
if (orderDetlPakout == null) {
- orderDetlPakout = orderDetlService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), null);
+ orderDetlPakout = orderDetlPakoutService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), null);
}
try {
if (!Cools.isEmpty(orderDetlPakout)) {
- if (!orderDetlService.increaseQtyByOrderNo(wrkDetl.getOrderNo(), wrkDetl.getMatnr(),
+ if (!orderDetlPakoutService.increaseQtyByOrderNo(wrkDetl.getOrderNo(), wrkDetl.getMatnr(),
orderDetlPakout.getBatch(), wrkDetl.getAnfme())) {
// exceptionHandle("鎷ｆ枡鍏ュ簱 ===>> 鏇存柊璁㈠崟瀹屾垚鏁伴噺澶辫触锛沎workNo={0}],[locNo={1}]",
// wrkMast.getWrkNo(), wrkMast.getLocNo());
@@ -259,13 +248,13 @@
}
if (!Cools.isEmpty(wrkDetl.getOrderNo())) {
// 鏇存柊璁㈠崟瀹屾垚鏁伴噺
- OrderDetlPakout orderDetlPakout = orderDetlService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
+ OrderDetlPakin orderDetlPakout = orderDetlPakinService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
if (orderDetlPakout == null) {
- orderDetlPakout = orderDetlService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), null);
+ orderDetlPakout = orderDetlPakinService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), null);
}
try {
if (!Cools.isEmpty(orderDetlPakout)) {
- if (!orderDetlService.increaseQtyByOrderNo(wrkDetl.getOrderNo(), wrkDetl.getMatnr(),
+ if (!orderDetlPakinService.increaseQtyByOrderNo(wrkDetl.getOrderNo(), wrkDetl.getMatnr(),
orderDetlPakout.getBatch(), wrkDetl.getAnfme())) {
// exceptionHandle("鍏ㄦ澘鍏ュ簱 ===>> 鏇存柊璁㈠崟瀹屾垚鏁伴噺澶辫触锛沎workNo={0}],[locNo={1}]",
// wrkMast.getWrkNo(), wrkMast.getLocNo());
@@ -418,13 +407,13 @@
}
for (WrkDetl wrkDetl : wrkDetls101) {
// 鏇存柊璁㈠崟瀹屾垚鏁伴噺
- OrderDetlPakout orderDetlPakout = orderDetlService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
+ OrderDetlPakout orderDetlPakout = orderDetlPakoutService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
if (orderDetlPakout == null) {
- orderDetlPakout = orderDetlService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), null);
+ orderDetlPakout = orderDetlPakoutService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), null);
}
try {
if (!Cools.isEmpty(orderDetlPakout)) {
- if (!orderDetlService.increaseQtyByOrderNo(wrkDetl.getOrderNo(), wrkDetl.getMatnr(),
+ if (!orderDetlPakoutService.increaseQtyByOrderNo(wrkDetl.getOrderNo(), wrkDetl.getMatnr(),
orderDetlPakout.getBatch(), wrkDetl.getAnfme())) {
// exceptionHandle("鍏ㄦ澘鍑哄簱 ===>> 鏇存柊璁㈠崟瀹屾垚鏁伴噺澶辫触锛沎workNo={0}],[locNo={1}]",
// wrkMast.getWrkNo(), wrkMast.getLocNo());
@@ -490,113 +479,6 @@
return SUCCESS;
}
-
- private ReturnT<String> doOut2_5(WrkMast wrkMast) {
- Date now = new Date();
- LocMast locMast = locMastService.selectById(wrkMast.getSourceLocNo());
- try {
- if (null == locMast) {
-// exceptionHandle("宸ヤ綔妗workNo={0}]搴撲綅鍙烽敊璇痆locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg("宸ヤ綔妗ｅ簱浣嶅彿閿欒; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
- }
- assert locMast != null;
- switch (wrkMast.getIoType()) {
- // 鍏ㄦ澘鍑哄簱
- case 101:
- List<WrkDetl> wrkDetls101 = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
- if (wrkMast.getStaNo() == 1135) {
- //閭ｉ渶瑕佺敓鎴愪竴鏉″洓椤瑰簱鐨勫叆搴撲换鍔�
- workService.toSxk(wrkMast, wrkDetls101, (short) 1);
- } else if (wrkMast.getStaNo() == 1031) {
- //閭ｉ渶瑕佺敓鎴愪竴鏉″洓椤瑰簱鐨勫叆搴撲换鍔�
- workService.toCrn(wrkMast, wrkDetls101, (short) 1);
- }
- // 鏍规嵁宸ヤ綔鍙凤紝鏌ヨ宸ヤ綔鏄庣粏妗�
- if (wrkDetls101.isEmpty()) {
-// exceptionHandle("鍏ㄦ澘鍑哄簱 ===>> 宸ヤ綔鏄庣粏妗ｄ负绌猴紱[workNo={0}]", wrkMast.getWrkNo());
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg("鍏ㄦ澘鍑哄簱 ===>> 宸ヤ綔鏄庣粏妗ｄ负绌�; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getSourceLocNo() + "]");
- }
- for (WrkDetl wrkDetl : wrkDetls101) {
- // 鏇存柊璁㈠崟瀹屾垚鏁伴噺
- OrderDetlPakout orderDetlPakout = orderDetlService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
- if (orderDetlPakout == null) {
- orderDetlPakout = orderDetlService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), null);
- }
- try {
- if (!Cools.isEmpty(orderDetlPakout)) {
- if (!orderDetlService.increaseQtyByOrderNo(wrkDetl.getOrderNo(), wrkDetl.getMatnr(),
- orderDetlPakout.getBatch(), wrkDetl.getAnfme())) {
-// exceptionHandle("鍏ㄦ澘鍑哄簱 ===>> 鏇存柊璁㈠崟瀹屾垚鏁伴噺澶辫触锛沎workNo={0}],[locNo={1}]",
-// wrkMast.getWrkNo(), wrkMast.getLocNo());
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg("鍏ㄦ澘鍑哄簱 ===>> 鏇存柊璁㈠崟瀹屾垚鏁伴噺澶辫触; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getSourceLocNo() + "]");
- }
- }
- } catch (Exception ignore) {
- }
- }
- // 鍒犻櫎宸ヤ綔妗ｆ簮搴撲綅鐨勫簱瀛樻槑缁�
- if (!locDetlService.delete(new EntityWrapper<LocDetl>().eq("loc_no", wrkMast.getSourceLocNo()))) {
-// exceptionHandle("鍏ㄦ澘鍑哄簱 ===>> 鍒犻櫎搴撳瓨鏄庣粏澶辫触锛沎workNo={0}],[sourceLocNo={1}]", wrkMast.getWrkNo(), wrkMast.getSourceLocNo());
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg("鍏ㄦ澘鍑哄簱 ===>> 鍒犻櫎搴撳瓨鏄庣粏澶辫触; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getSourceLocNo() + "]");
- }
- // 淇敼婧愬簱浣嶇姸鎬� R ===>> O
- if (locMast.getLocSts().equals("R")) {
- locMast.setLocSts("O");
- locMast.setBarcode("");
- locMast.setModiTime(now);
- locMast.setIoTime(now);
- if (!locMastService.updateById(locMast)) {
-// exceptionHandle("鍏ㄦ澘鍑哄簱 ===>> 淇敼婧愬簱浣嶇姸鎬佸け璐ワ紱[workNo={0}],[sourceLocNo={1}]", wrkMast.getWrkNo(), wrkMast.getSourceLocNo());
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg("鍏ㄦ澘鍑哄簱 ===>> 淇敼婧愬簱浣嶇姸鎬佸け璐�; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getSourceLocNo() + "]");
- }
- }
- break;
- // 绌烘澘鍑哄簱
- case 110:
- if (wrkMast.getStaNo() == 1135) {
- //閭ｉ渶瑕佺敓鎴愪竴鏉″洓椤瑰簱鐨勫叆搴撲换鍔�
- workService.toSxk(wrkMast, null, (short) 1);
- } else if (wrkMast.getStaNo() == 1031) {
- //閭ｉ渶瑕佺敓鎴愪竴鏉″洓椤瑰簱鐨勫叆搴撲换鍔�
- workService.toCrn(wrkMast, null, (short) 1);
- }
- // 淇敼搴撲綅鐘舵�� R ===>> O
- if (locMast.getLocSts().equals("R")) {
- locMast.setLocSts("O");
- locMast.setBarcode("");
- locMast.setModiTime(now);
- locMast.setIoTime(now);
- if (!locMastService.updateById(locMast)) {
-// exceptionHandle("绌烘澘鍑哄簱 ===>> 淇敼婧愬簱浣嶇姸鎬佸け璐ワ紱[workNo={0}],[sourceLocNo={1}]", wrkMast.getWrkNo(), wrkMast.getSourceLocNo());
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg("绌烘澘鍑哄簱 ===>> 淇敼婧愬簱浣嶇姸鎬佸け璐�; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getSourceLocNo() + "]");
- }
- }
- break;
- default:
- break;
- }
- // 淇敼宸ヤ綔涓绘。鐘舵��
- wrkMast.setWrkSts(15L);
- wrkMast.setModiTime(now);
- if (!wrkMastService.updateById(wrkMast)) {
-// exceptionHandle("鏇存柊鍑哄簱瀹屾垚鐘舵�佸け璐�;[workNo={0}]", wrkMast.getWrkNo());
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg("鏇存柊鍑哄簱瀹屾垚鐘舵�佸け璐�; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getSourceLocNo() + "]");
- }
- } catch (Exception e) {
- log.error("fail", e);
- e.printStackTrace();
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg(e.getMessage());
- }
- return SUCCESS;
- }
}
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 834dc61..3aab2e2 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -57,7 +57,9 @@
@Autowired
private WebSocketServer webSocketServer;
@Autowired
- private OrderDetlService orderDetlService;
+ private OrderDetlPakinService orderDetlPakinService;
+ @Autowired
+ private OrderDetlPakoutService orderDetlPakoutService;
@PostMapping("/led/getTask")
@@ -125,7 +127,7 @@
total = locDetl.getAnfme();
}
if (!Cools.isEmpty(wrkDetl.getOrderNo())) {
- OrderDetlPakout orderDetlPakout = orderDetlService.selectOne(new EntityWrapper<OrderDetlPakout>().eq("order_no", wrkDetl.getOrderNo())
+ OrderDetlPakout orderDetlPakout = orderDetlPakoutService.selectOne(new EntityWrapper<OrderDetlPakout>().eq("order_no", wrkDetl.getOrderNo())
.eq("matnr", wrkDetl.getMatnr()).eq("batch", wrkDetl.getBatch()));
if (wrkMast.getIoType() == 101 || wrkMast.getIoType() == 1) {
ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getManu(), wrkDetl.getMemo(), wrkDetl.getAnfme(), total, orderDetlPakout.getSuppCode(), orderDetlPakout.getSku()));
@@ -237,7 +239,7 @@
total = locDetl.getAnfme();
}
if (!Cools.isEmpty(wrkDetl.getOrderNo())) {
- OrderDetlPakout orderDetlPakout = orderDetlService.selectOne(new EntityWrapper<OrderDetlPakout>().eq("order_no", wrkDetl.getOrderNo())
+ OrderDetlPakout orderDetlPakout = orderDetlPakoutService.selectOne(new EntityWrapper<OrderDetlPakout>().eq("order_no", wrkDetl.getOrderNo())
.eq("matnr", wrkDetl.getMatnr()).eq("batch", wrkDetl.getBatch()));
if (wrkMast.getIoType() == 101 || wrkMast.getIoType() == 1) {
ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getManu(), wrkDetl.getMemo(), wrkDetl.getAnfme(), total, orderDetlPakout.getSuppCode(), orderDetlPakout.getSku()));
diff --git a/src/main/resources/mapper/OrderDetlPakinMapper.xml b/src/main/resources/mapper/OrderDetlPakinMapper.xml
index ae20de1..69169ed 100644
--- a/src/main/resources/mapper/OrderDetlPakinMapper.xml
+++ b/src/main/resources/mapper/OrderDetlPakinMapper.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zy.asrs.mapper.OrderDetlMapper">
+<mapper namespace="com.zy.asrs.mapper.OrderDetlPakinMapper">
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
<resultMap id="BaseResultMap" type="com.zy.asrs.entity.OrderDetlPakout">
diff --git a/src/main/resources/mapper/OrderDetlPakoutMapper.xml b/src/main/resources/mapper/OrderDetlPakoutMapper.xml
index e314c1c..f738848 100644
--- a/src/main/resources/mapper/OrderDetlPakoutMapper.xml
+++ b/src/main/resources/mapper/OrderDetlPakoutMapper.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zy.asrs.mapper.OrderDetlMapper">
+<mapper namespace="com.zy.asrs.mapper.OrderDetlPakoutMapper">
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
<resultMap id="BaseResultMap" type="com.zy.asrs.entity.OrderDetlPakout">
diff --git a/src/main/resources/mapper/OrderPakinMapper.xml b/src/main/resources/mapper/OrderPakinMapper.xml
index 17e4c72..295e144 100644
--- a/src/main/resources/mapper/OrderPakinMapper.xml
+++ b/src/main/resources/mapper/OrderPakinMapper.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zy.asrs.mapper.OrderMapper">
+<mapper namespace="com.zy.asrs.mapper.OrderPakinMapper">
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
<resultMap id="BaseResultMap" type="com.zy.asrs.entity.OrderPakin">
diff --git a/src/main/resources/mapper/OrderPakoutMapper.xml b/src/main/resources/mapper/OrderPakoutMapper.xml
index 6e830b2..8557105 100644
--- a/src/main/resources/mapper/OrderPakoutMapper.xml
+++ b/src/main/resources/mapper/OrderPakoutMapper.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zy.asrs.mapper.OrderMapper">
+<mapper namespace="com.zy.asrs.mapper.OrderPakoutMapper">
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
<resultMap id="BaseResultMap" type="com.zy.asrs.entity.OrderPakout">
--
Gitblit v1.9.1