From 9b42fa92ac328405850bea678a811d983871bc90 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 24 三月 2022 12:46:01 +0800
Subject: [PATCH] #杰克缝纫机立库 【手动添加】

---
 src/main/java/com/zy/asrs/controller/OrderController.java    |   77 +++++++++++++++++++++++++++++++++-----
 src/main/java/com/zy/asrs/service/OrderService.java          |    2 +
 src/main/java/com/zy/asrs/entity/OrderDetl.java              |    3 +
 src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java |   12 ++++++
 src/main/java/com/zy/asrs/entity/Order.java                  |    3 +
 src/main/webapp/views/order/order.html                       |    2 
 6 files changed, 87 insertions(+), 12 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..93a9a57 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -6,10 +6,8 @@
 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;
@@ -17,12 +15,10 @@
 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 +27,8 @@
     private OrderService orderService;
     @Autowired
     private OrderDetlService orderDetlService;
+    @Autowired
+    private SnowflakeIdWorker snowflakeIdWorker;
 
     @RequestMapping(value = "/order/head/page/auth")
     @ManagerAuth
@@ -42,7 +40,9 @@
         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);
+        }
         return R.ok(orderService.selectPage(new Page<>(curr, limit), wrapper));
     }
 
@@ -54,9 +54,64 @@
 
     @RequestMapping(value = "/order/form/add/auth")
     @ManagerAuth
+    @Transactional
     public R formAdd(@RequestBody InitOrderParam param){
-        System.out.println(JSON.toJSONString(param));
-        return R.ok();
+        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("淇濆瓨璁㈠崟鏄庣粏妗eけ璐�");
+            }
+        }
+        return R.ok("璁㈠崟娣诲姞鎴愬姛");
     }
 
     @RequestMapping(value = "/order/form/modify/auth")
diff --git a/src/main/java/com/zy/asrs/entity/Order.java b/src/main/java/com/zy/asrs/entity/Order.java
index 4f8cc19..99abc64 100644
--- a/src/main/java/com/zy/asrs/entity/Order.java
+++ b/src/main/java/com/zy/asrs/entity/Order.java
@@ -1,7 +1,9 @@
 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;
@@ -26,6 +28,7 @@
      * ID
      */
     @ApiModelProperty(value= "ID")
+    @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
     /**
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetl.java b/src/main/java/com/zy/asrs/entity/OrderDetl.java
index f78dd2a..78f8266 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetl.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetl.java
@@ -1,7 +1,9 @@
 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.OrderService;
@@ -25,6 +27,7 @@
      * ID
      */
     @ApiModelProperty(value= "ID")
+    @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
     /**
diff --git a/src/main/java/com/zy/asrs/service/OrderService.java b/src/main/java/com/zy/asrs/service/OrderService.java
index c895c8e..1ddf955 100644
--- a/src/main/java/com/zy/asrs/service/OrderService.java
+++ b/src/main/java/com/zy/asrs/service/OrderService.java
@@ -5,4 +5,6 @@
 
 public interface OrderService extends IService<Order> {
 
+    Order selectByNo(String orderNo);
+
 }
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
index 8b3c975..09c4e0a 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
@@ -1,12 +1,24 @@
 package com.zy.asrs.service.impl;
 
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.Cools;
 import com.zy.asrs.mapper.OrderMapper;
 import com.zy.asrs.entity.Order;
 import com.zy.asrs.service.OrderService;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 @Service("orderService")
 public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements OrderService {
 
+    @Override
+    public Order selectByNo(String orderNo) {
+        List<Order> orderList = this.selectList(new EntityWrapper<Order>().eq("order_no", orderNo));
+        if (Cools.isEmpty(orderList)) {
+            return null;
+        }
+        return orderList.get(0);
+    }
 }
diff --git a/src/main/webapp/views/order/order.html b/src/main/webapp/views/order/order.html
index 154b231..265a50c 100644
--- a/src/main/webapp/views/order/order.html
+++ b/src/main/webapp/views/order/order.html
@@ -74,7 +74,7 @@
     <form id="editForm" lay-filter="editForm" class="layui-form model-form">
         <input name="experimentTypeId" type="hidden"/>
         <div class="layui-form-item">
-            <label class="layui-form-label">鍗曟嵁绫诲瀷: </label>
+            <label class="layui-form-label">鍗曟嵁绫诲瀷锛�</label>
             <div class="layui-input-block cool-auto-complete">
                 <input class="layui-input" name="docType" placeholder="璇疯緭鍏ュ崟鎹被鍨�" style="display: none">
                 <input id="docType$" name="docType$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ュ崟鎹被鍨�" onfocus=this.blur() lay-verType="tips" lay-verify="required">

--
Gitblit v1.9.1