From 609a1b7daafdc351f6601c046ea3ffae64b6709a Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 24 三月 2022 13:42:59 +0800
Subject: [PATCH] #杰克缝纫机立库 【手动修改订单 + 优化】
---
src/main/java/com/zy/asrs/controller/OrderController.java | 172 ++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 127 insertions(+), 45 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..1d557aa 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.core.common.*;
+import com.core.exception.CoolException;
import com.zy.asrs.entity.Order;
import com.zy.asrs.entity.OrderDetl;
-import com.zy.asrs.entity.param.InitOrderParam;
+import com.zy.asrs.entity.param.OrderDomainParam;
import com.zy.asrs.service.OrderDetlService;
import com.zy.asrs.service.OrderService;
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,8 @@
private OrderService orderService;
@Autowired
private OrderDetlService orderDetlService;
+ @Autowired
+ private SnowflakeIdWorker snowflakeIdWorker;
@RequestMapping(value = "/order/head/page/auth")
@ManagerAuth
@@ -42,7 +39,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("create_time", false);
+ }
+ wrapper.eq("status", 1);
return R.ok(orderService.selectPage(new Page<>(curr, limit), wrapper));
}
@@ -53,22 +53,117 @@
}
@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){
+ Order order = orderService.selectByNo(param.getOrderNo());
+ if (order != 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("淇濆瓨璁㈠崟涓绘。澶辫触");
+ }
+ for (OrderDetl orderDetl : param.getOrderDetlList()) {
+ orderDetl.setOrderId(order.getId());
+ orderDetl.setCreateBy(getUserId());
+ orderDetl.setCreateTime(now);
+ orderDetl.setUpdateBy(getUserId());
+ orderDetl.setUpdateTime(now);
+ orderDetl.setStatus(1);
+ 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.閲嶇粍鏁版嵁
+ for (OrderDetl orderDetl : param.getOrderDetlList()) {
+ OrderDetl detl = orderDetlService.findByLook(orderDetls, order.getId(), orderDetl.getMatnr(), orderDetl.getBatch());
+ // 鏂板
+ if (detl == null) {
+ detl = orderDetl;
+ detl.setOrderId(order.getId());
+ detl.setCreateTime(now);
+ detl.setCreateBy(userId);
+ detl.setUpdateTime(now);
+ detl.setUpdateBy(userId);
+ detl.setStatus(1);
+ // 淇敼
+ } else {
+ detl.setAnfme(orderDetl.getAnfme()); // 淇敼鏁伴噺
+ detl.setUpdateTime(now);
+ detl.setUpdateBy(userId);
+ }
+ // 鎸佷箙鍖�
+ if (!orderDetlService.insert(detl)) {
+ throw new CoolException("鏂板璁㈠崟鏄庣粏澶辫触");
+ }
+ }
+ return R.ok("璁㈠崟淇敼鎴愬姛");
}
-
-
-
-
@@ -110,28 +205,15 @@
}
}
- @RequestMapping(value = "/order/add/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()){
- return R.error();
- }
- orderService.updateById(order);
- 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 = "鎵嬪姩鍒犻櫎璁㈠崟")
+ public R delete(@RequestParam Long orderId){
+ Order order = orderService.selectById(orderId);
+ if (order != null) {
+ order.setStatus(0);
+ }
+ if (!orderService.updateById(order)) {
+ throw new CoolException("鍒犻櫎璁㈠崟澶辫触");
}
return R.ok();
}
@@ -157,7 +239,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);
--
Gitblit v1.9.1