From 157e6e40348f7605761460bbcf56d3aba9c0c022 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 24 三月 2022 13:25:52 +0800
Subject: [PATCH] #杰克缝纫机立库 【手动修改订单】 - 1

---
 src/main/java/com/zy/asrs/controller/OrderController.java |   67 ++++++++++++++++++---------------
 1 files changed, 37 insertions(+), 30 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index 2ada0f8..cafda96 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -1,6 +1,5 @@
 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;
@@ -10,7 +9,7 @@
 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;
@@ -54,9 +53,9 @@
     }
 
     @RequestMapping(value = "/order/form/add/auth")
-    @ManagerAuth
+    @ManagerAuth(memo = "鎵嬪姩娣诲姞璁㈠崟")
     @Transactional
-    public R formAdd(@RequestBody InitOrderParam param){
+    public R formAdd(@RequestBody OrderDomainParam param){
         Order order = orderService.selectByNo(param.getOrderNo());
         if (order != null) {
             return R.error("鍗曟嵁缂栧彿宸插瓨鍦�");
@@ -116,15 +115,40 @@
     }
 
     @RequestMapping(value = "/order/form/modify/auth")
-    @ManagerAuth
-    public R formModify(@RequestBody InitOrderParam param){
-        System.out.println(JSON.toJSONString(param));
+    @ManagerAuth(memo = "鎵嬪姩淇敼璁㈠崟")
+    @Transactional
+    public R formModify(@RequestBody OrderDomainParam param){
+        Order order = orderService.selectById(param.getOrderId());
+        if (order == null || order.getStatus() == 0) {
+            return R.error("璁㈠崟涓嶅瓨鍦�");
+        }
+        // 淇敼涓绘。
+        if (!param.getDocType().equals(order.getDocType())) {
+            order.setDocType(param.getDocType());
+            order.setUpdateBy(getUserId());
+            order.setUpdateTime(new Date());
+            if (!orderService.updateById(order)) {
+                throw new CoolException("淇敼璁㈠崟绫诲瀷澶辫触");
+            }
+        }
+        // 淇敼鏄庣粏妗�
+        Iterator<OrderDetl> iterator = param.getOrderDetlList().iterator();
+        while (iterator.hasNext()) {
+            OrderDetl orderDetl = iterator.next();
+            OrderDetl detl = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch());
+            // 鏂板
+            if (detl == null) {
+
+            // 淇敼
+            } else {
+
+            }
+        }
+
+        List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
+
         return R.ok();
     }
-
-
-
-
 
 
 
@@ -166,25 +190,8 @@
         }
     }
 
-    @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
+    @ManagerAuth(memo = "鎵嬪姩鍒犻櫎璁㈠崟")
     public R delete(@RequestParam Long orderId){
         Order order = orderService.selectById(orderId);
         if (order != null) {
@@ -217,7 +224,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