From 21d0e7ab9d5c7316225a3e9eecf465cd37c9bd85 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 05 六月 2025 14:15:07 +0800
Subject: [PATCH] 123

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

diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index 38170b6..8e7ad7d 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.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.mapper.Wrapper;
@@ -12,6 +13,7 @@
 import com.zy.asrs.entity.result.WrkTraceVo;
 import com.zy.asrs.service.*;
 import com.zy.common.model.DetlDto;
+import com.zy.common.model.OrderDto;
 import com.zy.common.web.BaseController;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
@@ -28,6 +30,7 @@
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.text.SimpleDateFormat;
 import java.util.*;
 
 @Slf4j
@@ -50,6 +53,10 @@
     private WrkMastLogService wrkMastLogService;
     @Autowired
     private LocDetlService locDetlService;
+    @Autowired
+    private OrderLogService orderLogService;
+    @Autowired
+    private MatService matService;
 
     @RequestMapping(value = "/order/nav/list/auth")
     @ManagerAuth
@@ -99,7 +106,9 @@
     @RequestMapping(value = "/order/detl/all/auth")
     @ManagerAuth
     public R head(@RequestParam Long orderId){
-        return R.ok().add(orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_id", orderId)));
+        List<OrderDetl> orderDetls = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_id", orderId));
+        orderDetls.removeIf(next -> next.getQty() > 0);
+        return R.ok().add(orderDetls);
     }
 
     @RequestMapping(value = "/order/form/add/auth")
@@ -265,6 +274,15 @@
         List<WrkTraceVo> wrkTraceVos = new ArrayList<>();
         List<WrkDetl> wrkDetls = wrkDetlService.selectAndLogByOrderNoGroupByMatnrOfSum(order.getOrderNo());
         for (WrkDetl wrkDetl : wrkDetls) {
+            if (isJSON(wrkDetl.getOrderNo())) {
+                List<OrderDto> orderDtoList = JSON.parseArray(wrkDetl.getOrderNo(), OrderDto.class);
+                for (OrderDto one : orderDtoList) {
+                    if (one.getOrderNo().equals(order.getOrderNo())) {
+                        wrkDetl.setAnfme(one.getAnfme());
+                        break;
+                    }
+                }
+            }
             WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", wrkDetl.getWrkNo()).eq("io_time", wrkDetl.getIoTime()));
             if (wrkMast == null) {
                 WrkMastLog wrkMastLog = wrkMastLogService.selectOne(new EntityWrapper<WrkMastLog>().eq("wrk_no", wrkDetl.getWrkNo()).eq("io_time", wrkDetl.getIoTime()));
@@ -322,6 +340,24 @@
         return R.ok(orderService.selectPage(new Page<>(curr, limit), wrapper));
     }
 
+    @RequestMapping(value = "/order/list/log/auth")
+    @ManagerAuth
+    public R listLog(@RequestParam(defaultValue = "1")Integer curr,
+                  @RequestParam(defaultValue = "10")Integer limit,
+                  @RequestParam(required = false)String orderByField,
+                  @RequestParam(required = false)String orderByType,
+                  @RequestParam Map<String, Object> param){
+        EntityWrapper<OrderLog> wrapper = new EntityWrapper<>();
+        excludeTrash(param);
+        convert(param, wrapper);
+        if (!Cools.isEmpty(orderByField)){
+            wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+        } else {
+            wrapper.orderBy("create_time", false);
+        }
+        return R.ok(orderLogService.selectPage(new Page<>(curr, limit), wrapper));
+    }
+
     private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
         for (Map.Entry<String, Object> entry : map.entrySet()){
             String val = String.valueOf(entry.getValue());
@@ -363,6 +399,22 @@
 //        }
 //        orderDetlService.modifyStatus(orderId, 0);
         return R.ok();
+    }
+
+    @RequestMapping(value = "/order/exportOrder/auth")
+    @ManagerAuth(memo = "瀵煎嚭璁㈠崟")
+    @Transactional
+    public R exportOrder(@RequestParam Long orderId){
+        List<String> fields = new ArrayList<>();
+        fields.add("orderNo");
+        fields.add("matnr");
+        fields.add("maktx");
+        fields.add("specs");
+        fields.add("anfme");
+        fields.add("qty");
+        EntityWrapper<OrderDetl> wrapper = new EntityWrapper<>();
+        List<OrderDetl> orderDetls = orderDetlService.selectList(wrapper.eq("order_id",orderId));
+        return R.ok(exportSupport(orderDetls, fields));
     }
 
     @RequestMapping(value = "/order/export/auth")
@@ -446,15 +498,95 @@
             // 鏁伴噺
             Double anfme = Double.parseDouble(dataFormatter.formatCellValue(row.getCell(3)));
             // 涓嬪崟鏃堕棿
-            Date time = DateUtils.convert(dataFormatter.formatCellValue(row.getCell(4)), DateUtils.yyyyMMddHHmmsssss_F);
+            String timeStr = dataFormatter.formatCellValue(row.getCell(4));
+
+            if (Cools.isEmpty(timeStr)) {
+                timeStr = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss").format(now);
+            }
+            // 鍗曟嵁绫诲瀷
+            Long orderType = Long.parseLong(dataFormatter.formatCellValue(row.getCell(5)));
+            Date time = null;
+            try {
+                time = DateUtils.convert(timeStr, DateUtils.yyyyMMddHHmmss_F);
+            } catch (Exception e) {
+                throw new CoolException("绗�" + i + "琛屼笅鐨勯偅鏃堕棿瑙f瀽澶辫触锛岃閲嶆柊瀵煎叆锛�");
+            }
             // 鍟嗗搧绯诲垪
             String tagName = dataFormatter.formatCellValue(row.getCell(5));
             // 瑙勬牸
             String specs = dataFormatter.formatCellValue(row.getCell(6));
 
+            Mat mat = matService.selectByMatnr(matnr);
+            if (null == mat) {
+                throw new CoolException(matnr + "鍟嗗搧缂栫爜鐨勫晢鍝佷笉瀛樺湪锛岃閲嶆柊瀵煎叆锛�");
+            }
 
+            Order order = orderService.selectByNo(uuid);
+            if (null == order) {
+                order = new Order(
+                        String.valueOf(snowflakeIdWorker.nextId()),    // 缂栧彿[闈炵┖]
+                        uuid,    // 璁㈠崟缂栧彿
+                        timeStr,    // 鍗曟嵁鏃ユ湡
+                        orderType,    // 鍗曟嵁绫诲瀷
+                        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,    // 鐘舵��
+                        userId,    // 娣诲姞浜哄憳
+                        now,    // 娣诲姞鏃堕棿
+                        userId,    // 淇敼浜哄憳
+                        now,    // 淇敼鏃堕棿
+                        null    // 澶囨敞
+                );
+                if (!orderService.insert(order)) {
+                    throw new CoolException("鐢熸垚鍗曟嵁涓绘。澶辫触锛岃閲嶆柊瀵煎叆锛�");
+                }
+            }
+
+            OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), matnr, null);
+            if (orderDetl == null) {
+                orderDetl = new OrderDetl();
+                orderDetl.sync(mat);
+                orderDetl.setBatch(null);
+                orderDetl.setAnfme(anfme);
+                orderDetl.setOrderId(order.getId());
+                orderDetl.setOrderNo(order.getOrderNo());
+                orderDetl.setCreateBy(userId);
+                orderDetl.setCreateTime(now);
+                orderDetl.setUpdateBy(userId);
+                orderDetl.setUpdateTime(now);
+                orderDetl.setStatus(1);
+                orderDetl.setQty(0.0D);
+                if (!orderDetlService.insert(orderDetl)) {
+                    throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃閲嶆柊瀵煎叆锛�");
+                }
+            } else {
+                if(!orderDetlService.increaseAnfme(order.getId(), matnr, null, anfme)) {
+                    throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃閲嶆柊瀵煎叆锛�");
+                }
+            }
         }
-        return R.ok();
+        return R.ok("瀵煎叆鎴愬姛");
     }
-
 }

--
Gitblit v1.9.1