From 61d28206585b8746a9f1982cfe1dfc5deabde91a Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期六, 17 六月 2023 09:03:27 +0800
Subject: [PATCH] #库存统计更改为包括立库、平库
---
src/main/java/com/zy/asrs/controller/OrderController.java | 297 ++++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 250 insertions(+), 47 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index b65313a..e73b8de 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -1,28 +1,23 @@
package com.zy.asrs.controller;
-import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.core.annotations.ManagerAuth;
-import com.core.common.BaseRes;
-import com.core.common.Cools;
-import com.core.common.DateUtils;
-import com.core.common.R;
-import com.zy.asrs.entity.Order;
-import com.zy.asrs.entity.OrderDetl;
-import com.zy.asrs.entity.param.InitOrderParam;
-import com.zy.asrs.service.OrderDetlService;
-import com.zy.asrs.service.OrderService;
+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.service.*;
+import com.zy.common.CodeRes;
+import com.zy.common.model.DetlDto;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
@RestController
public class OrderController extends BaseController {
@@ -31,6 +26,46 @@
private OrderService orderService;
@Autowired
private OrderDetlService orderDetlService;
+ @Autowired
+ private SnowflakeIdWorker snowflakeIdWorker;
+ @Autowired
+ private DocTypeService docTypeService;
+ @Autowired
+ private WrkDetlService wrkDetlService;
+ @Autowired
+ private WaitPakinService waitPakinService;
+ @Autowired
+ private LocOwnerService locOwnerService;
+ @Autowired
+ private OrderLogService orderLogService;
+
+ @RequestMapping(value = "/order/nav/list/auth")
+ @ManagerAuth
+ public R navList(@RequestParam(required = false) String orderNo){
+ EntityWrapper<Order> 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<Order> orders = orderService.selectList(wrapper);
+ // 淇濈暀鍑哄簱鍗�
+ if (!Cools.isEmpty(orders)) {
+ Iterator<Order> iterator = orders.iterator();
+ while (iterator.hasNext()) {
+ Order order = iterator.next();
+ if (order.getDocType() != null) {
+ DocType docType = docTypeService.selectById(order.getDocType());
+ if (docType != null) {
+ if (docType.getPakout() == 0) {
+ iterator.remove();
+ }
+ }
+ }
+ }
+ }
+ return R.ok().add(orders);
+ }
@RequestMapping(value = "/order/head/page/auth")
@ManagerAuth
@@ -42,7 +77,10 @@
EntityWrapper<Order> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} else {
+ wrapper.orderBy("settle").orderBy("create_time", false);
+ }
+ wrapper.eq("status", 1);
return R.ok(orderService.selectPage(new Page<>(curr, limit), wrapper));
}
@@ -53,26 +91,159 @@
}
@RequestMapping(value = "/order/form/add/auth")
- @ManagerAuth
- public R formAdd(@RequestBody InitOrderParam param){
- System.out.println(JSON.toJSONString(param));
- return R.ok();
+ @ManagerAuth(memo = "鎵嬪姩娣诲姞璁㈠崟")
+ @Transactional
+ public R formAdd(@RequestBody OrderDomainParam param){
+ String prefix = "";
+ DocType docType = docTypeService.selectById(param.getDocType());
+ if(!Cools.isEmpty(docType)){
+ prefix = docType.getPakin() == 1 ? "RK" : "CK";
+ }
+ if(Cools.isEmpty(param.getOrderNo())){
+ param.setOrderNo(prefix + snowflakeIdWorker.nextId());
+ }
+ Order order = orderService.selectByNo(param.getOrderNo());
+ OrderLog orderLog = orderLogService.selectByNo(param.getOrderNo());
+ if (order != null) {
+ return R.error("鍗曟嵁缂栧彿宸插瓨鍦�");
+ }
+ if (orderLog != null) {
+ return R.error("鍗曟嵁缂栧彿鍦ㄥ巻鍙叉。涓凡瀛樺湪");
+ }
+ Date now = new Date();
+ order = new Order(
+ String.valueOf(snowflakeIdWorker.nextId()), // 缂栧彿[闈炵┖]
+ param.getOrderNo(), // 璁㈠崟缂栧彿
+ DateUtils.convert(now), // 鍗曟嵁鏃ユ湡
+ param.getDocType(), // 鍗曟嵁绫诲瀷
+ null, // 椤圭洰缂栧彿
+ null, //
+ null, // 璋冩嫧椤圭洰缂栧彿
+ null, // 鍒濆绁ㄦ嵁鍙�
+ null, // 绁ㄦ嵁鍙�
+ null, // 瀹㈡埛缂栧彿
+ null, // 瀹㈡埛
+ null, // 鑱旂郴鏂瑰紡
+ null, // 鎿嶄綔浜哄憳
+ null, // 鍚堣閲戦
+ null, // 浼樻儬鐜�
+ null, // 浼樻儬閲戦
+ null, // 閿�鍞垨閲囪喘璐圭敤鍚堣
+ null, // 瀹炰粯閲戦
+ null, // 浠樻绫诲瀷
+ null, // 涓氬姟鍛�
+ null, // 缁撶畻澶╂暟
+ null, // 閭垂鏀粯绫诲瀷
+ null, // 閭垂
+ null, // 浠樻鏃堕棿
+ null, // 鍙戣揣鏃堕棿
+ null, // 鐗╂祦鍚嶇О
+ null, // 鐗╂祦鍗曞彿
+ 1L, // 璁㈠崟鐘舵��
+ 1, // 鐘舵��
+ getUserId(), // 娣诲姞浜哄憳
+ now, // 娣诲姞鏃堕棿
+ getUserId(), // 淇敼浜哄憳
+ now, // 淇敼鏃堕棿
+ null // 澶囨敞
+ );
+ if (!orderService.insert(order)) {
+ throw new CoolException("淇濆瓨璁㈠崟涓绘。澶辫触");
+ }
+ List<DetlDto> list = new ArrayList<>();
+ for (OrderDetl orderDetl : param.getOrderDetlList()) {
+ if (Cools.isEmpty(orderDetl.getOwner())){
+ throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�,璇疯緭鍏ヨ揣涓荤紪鍙�");
+ }else {
+ LocOwner locOwner = locOwnerService.selectById(orderDetl.getOwner());
+ if (Cools.isEmpty(locOwner)){
+ throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�,璇疯緭鍏ュ瓨鍦ㄧ殑璐т富缂栧彿锛堟暣鏁帮級");
+ }
+ }
+ if (orderDetl.getBatch() == null) {
+ orderDetl.setBatch("");
+ }
+ DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getBatch());
+ if (DetlDto.has(list, dto)) {
+ OrderDetl item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch());
+ item.setAnfme(item.getAnfme() + orderDetl.getAnfme());
+ if (!orderDetlService.updateById(item)) {
+ throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�");
+ }
+ } else {
+ list.add(dto);
+ orderDetl.setOrderId(order.getId());
+ orderDetl.setOrderNo(order.getOrderNo());
+ orderDetl.setCreateBy(getUserId());
+ orderDetl.setCreateTime(now);
+ orderDetl.setUpdateBy(getUserId());
+ orderDetl.setUpdateTime(now);
+ orderDetl.setStatus(1);
+ orderDetl.setQty(0.0D);
+ if(orderDetl.getPayment() == null){
+ orderDetl.setPayment(1);
+ }
+ orderDetl.setUuid(String.valueOf(System.currentTimeMillis()));
+ if (!orderDetlService.insert(orderDetl)) {
+ throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�");
+ }
+ }
+ }
+ return R.ok("璁㈠崟娣诲姞鎴愬姛");
}
@RequestMapping(value = "/order/form/modify/auth")
- @ManagerAuth
- public R formModify(@RequestBody InitOrderParam param){
- System.out.println(JSON.toJSONString(param));
- return R.ok();
+ @ManagerAuth(memo = "鎵嬪姩淇敼璁㈠崟")
+ @Transactional
+ public R formModify(@RequestBody OrderDomainParam param){
+ Order order = orderService.selectById(param.getOrderId());
+ if (order == null || order.getStatus() == 0) {
+ return R.error("璁㈠崟涓嶅瓨鍦�");
+ }
+ Date now = new Date();
+ Long userId = getUserId();
+ // 淇敼涓绘。
+ if (!param.getDocType().equals(order.getDocType())) {
+ order.setDocType(param.getDocType());
+ order.setUpdateBy(userId);
+ order.setUpdateTime(now);
+ if (!orderService.updateById(order)) {
+ throw new CoolException("淇敼璁㈠崟绫诲瀷澶辫触");
+ }
+ }
+ // 淇敼鏄庣粏妗�
+// List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
+ // 1.娓呯┖鏄庣粏妗�
+ if (!orderDetlService.delete(new EntityWrapper<OrderDetl>().eq("order_id", order.getId()))) {
+ throw new CoolException("娓呯┖璁㈠崟鏄庣粏澶辫触");
+ }
+ // 2.閲嶇粍鏁版嵁
+ List<DetlDto> list = new ArrayList<>();
+ for (OrderDetl orderDetl : param.getOrderDetlList()) {
+ DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getBatch());
+ if (DetlDto.has(list, dto)) {
+ OrderDetl item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch());
+ item.setAnfme(item.getAnfme() + orderDetl.getAnfme());
+ if (!orderDetlService.updateById(item)) {
+ throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�");
+ }
+ } else {
+ list.add(dto);
+ orderDetl.setOrderId(order.getId());
+ orderDetl.setOrderNo(order.getOrderNo());
+ orderDetl.setCreateBy(getUserId());
+ orderDetl.setCreateTime(now);
+ orderDetl.setUpdateBy(getUserId());
+ orderDetl.setUpdateTime(now);
+ orderDetl.setStatus(1);
+ orderDetl.setQty(0.0D);
+ if (!orderDetlService.insert(orderDetl)) {
+ throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�");
+ }
+ }
+ }
+ return R.ok("璁㈠崟淇敼鎴愬姛");
}
-
-
-
-
-
-
-
-
// ------------------------------------------------------------------------------------------------
@@ -110,29 +281,43 @@
}
}
- @RequestMapping(value = "/order/add/auth")
+ @RequestMapping(value = "/order/update/auth")
@ManagerAuth
- public R add(Order order) {
- orderService.insert(order);
- return R.ok();
- }
-
- @RequestMapping(value = "/order/update/auth")
- @ManagerAuth
public R update(Order order){
- if (Cools.isEmpty(order) || null==order.getId()){
+ if (Cools.isEmpty(order) || null == order.getId()){
return R.error();
}
- orderService.updateById(order);
+
+ //璁㈠崟瀹岀粨鍓嶏紝鍒ゆ柇鏄惁瀛樺湪浣滀笟涓暟鎹紝瀛樺湪鍒欎笉鑳藉畬缁�
+ if(order.getSettle() == 4){
+ int wrkCount = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("order_no",order.getOrderNo()));
+ int pakinCount = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("order_no",order.getOrderNo()));
+ if (wrkCount > 0 || pakinCount > 0) {
+ throw new CoolException("瀛樺湪浣滀笟涓暟鎹紝涓嶈兘瀹岀粨銆傝妫�鏌ュ叆搴撻�氱煡妗ｅ拰宸ヤ綔妗�");
+ }
+ }
+
+ order.setUpdateBy(getUserId());
+ order.setUpdateTime(new Date());
+ if (!orderService.updateById(order)) {
+ throw new CoolException("淇敼璁㈠崟澶辫触");
+ }
return R.ok();
}
@RequestMapping(value = "/order/delete/auth")
- @ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
- orderService.deleteById(id);
- }
+ @ManagerAuth(memo = "鎵嬪姩鍒犻櫎璁㈠崟")
+ @Transactional
+ public R delete(@RequestParam Long orderId){
+ orderService.remove(orderId);
+// Order order = orderService.selectById(orderId);
+// if (order != null) {
+// order.setStatus(0);
+// }
+// if (!orderService.updateById(order)) {
+// throw new CoolException("鍒犻櫎璁㈠崟澶辫触");
+// }
+// orderDetlService.modifyStatus(orderId, 0);
return R.ok();
}
@@ -157,7 +342,7 @@
for (Order order : page.getRecords()){
Map<String, Object> map = new HashMap<>();
map.put("id", order.getId());
- map.put("value", order.getId());
+ map.put("value", order.getOrderNo());
result.add(map);
}
return R.ok(result);
@@ -172,5 +357,23 @@
}
return R.ok();
}
+ @RequestMapping(value = "/order/print/auth")
+ @ManagerAuth(memo = "璁㈠崟缂栫爜鎵撳嵃")
+ public R orderPrint(@RequestParam(value = "param[]") String[] param) {
+ if(Cools.isEmpty(param)) {
+ return R.parse(CodeRes.EMPTY);
+ }
+ List<OrderDetl> res = new ArrayList<>();
+ for (String orderNo : param){
+ res = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_no", orderNo));
+ }
+ return R.ok().add(res);
+ }
+
+ @RequestMapping("/order/in")
+ public R in(@RequestBody JSONObject param){
+ System.out.println("111 = " + 111);
+ return R.ok();
+ }
}
--
Gitblit v1.9.1