From db91e03deeaac1bb3344d0b5cb9e1240f1f8caac Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期六, 16 八月 2025 10:39:15 +0800
Subject: [PATCH] #计划组货单下发上报

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

diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index fd50042..3d7fac7 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -1,5 +1,6 @@
 package com.zy.asrs.controller;
 
+import com.alibaba.excel.EasyExcel;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.mapper.Wrapper;
@@ -11,14 +12,23 @@
 import com.zy.asrs.entity.param.OrderDomainParam;
 
 import com.zy.asrs.entity.result.WrkTraceVo;
+import com.zy.asrs.importexcle.ImportOrderDto;
+import com.zy.asrs.importexcle.ImportOrderListener;
+import com.zy.asrs.mapper.OrderDetlMapper;
 import com.zy.asrs.service.*;
+import com.zy.asrs.utils.FileSaveExampleUtil;
 import com.zy.common.model.DetlDto;
 import com.zy.common.web.BaseController;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.*;
 
 @RestController
@@ -43,6 +53,29 @@
     @Autowired
     private WrkMastLogService wrkMastLogService;
 
+    @Resource
+    private OrderDetlMapper orderDetlMapper;
+
+    @PostMapping("/importOrder")
+    @ManagerAuth(memo = "鍗曟嵁瀵煎叆")
+    @ApiOperation(value = "鍗曟嵁瀵煎叆", produces = MediaType.APPLICATION_JSON_VALUE)
+    public R importOrderData(@RequestParam("file") MultipartFile multipartFile) {
+        try {
+            importOrder(multipartFile);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return R.error(e.getMessage());
+        }
+        return R.ok("瀵煎叆鎴愬姛");
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    public void importOrder(MultipartFile multipartFile) throws IOException {
+        // 鑰冩牳鏁版嵁鐨勫垽閲嶄娇鐢╫rder_id,check_type鐨勭粍鍚堝敮涓�绱㈠紩瑙ｅ喅
+        EasyExcel.read(multipartFile.getInputStream(), ImportOrderDto.class,
+                new ImportOrderListener(orderService, orderDetlMapper,docTypeService, snowflakeIdWorker,getUserId())).sheet().doReadSync();
+    }
+
     @RequestMapping(value = "/order/nav/list/auth")
     @ManagerAuth
     public R navList(@RequestParam(required = false) String orderNo){
@@ -50,7 +83,7 @@
         if (!Cools.isEmpty(orderNo)) {
             wrapper.like("order_no", orderNo);
         }
-        wrapper.le("settle", 2).eq("status", 1);
+        wrapper.le("settle", 2).eq("status", 1).ne("doc_type",25);
         wrapper.orderBy("create_time", false);
         List<Order> orders = orderService.selectList(wrapper);
         // 淇濈暀鍑哄簱鍗�
@@ -68,6 +101,34 @@
                 }
             }
         }
+        return R.ok().add(orders);
+    }
+
+    @RequestMapping(value = "/order/nav/listMes/auth")
+    @ManagerAuth
+    public R navListMes(@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", 0).eq("doc_type", 25);
+        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);
     }
 
@@ -417,4 +478,32 @@
         return R.ok();
     }
 
+    @RequestMapping(value = "/order/insert/labelUp/file/auth")
+//    @ManagerAuth
+    public R insertLabelUpFile(@RequestParam("orderId") String orderId,@RequestParam MultipartFile file){
+        String[] split = orderId.split("-");
+        int id = Integer.parseInt(split[1]);
+        System.out.println("---寮�濮�---");
+        String savePath = "D:/order/labelUp/file/"+id+"/"; // 鎸囧畾淇濆瓨鏂囦欢鐨勮矾寰�
+        try{
+            FileSaveExampleUtil.saveFile(file, savePath);
+        }catch (Exception e){
+            return R.error();
+        }
+        return R.ok();
+    }
+
+    @RequestMapping(value = "/order/view/labelUp/file/auth")
+//    @ManagerAuth
+    public R viewLabelUpFile(@RequestParam("orderId") Long orderId){
+//        int id = Integer.parseInt(orderId);
+        String savePath = "D:/order/labelUp/file/"+orderId+"/"; // 鎸囧畾淇濆瓨鏂囦欢鐨勮矾寰�
+        try{
+            List<FileSaveExampleUtil.FileDTO> fileDTOS = FileSaveExampleUtil.viewFileList(savePath);
+            return R.ok(fileDTOS);
+        }catch (Exception e){
+            return R.error();
+        }
+    }
+
 }

--
Gitblit v1.9.1