From 82bcd0328dddbaad65933e2fada22bc68e82b3d5 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期六, 26 八月 2023 10:07:46 +0800
Subject: [PATCH] # 导入订单增加单据类型
---
src/main/java/com/zy/asrs/controller/OrderController.java | 28 ++++++++++++++++++++++------
1 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index 9cf0b36..1cf392f 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;
@@ -101,7 +103,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")
@@ -267,6 +271,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()));
@@ -449,6 +462,9 @@
Double anfme = Double.parseDouble(dataFormatter.formatCellValue(row.getCell(3)));
// 涓嬪崟鏃堕棿
String timeStr = dataFormatter.formatCellValue(row.getCell(4));
+
+ // 鍗曟嵁绫诲瀷
+ Long orderType = Long.parseLong(dataFormatter.formatCellValue(row.getCell(5)));
Date time = null;
try {
time = DateUtils.convert(timeStr, DateUtils.yyyyMMddHHmmss_F);
@@ -471,7 +487,7 @@
String.valueOf(snowflakeIdWorker.nextId()), // 缂栧彿[闈炵┖]
uuid, // 璁㈠崟缂栧彿
timeStr, // 鍗曟嵁鏃ユ湡
- 14L, // 鍗曟嵁绫诲瀷
+ orderType, // 鍗曟嵁绫诲瀷
null, // 椤圭洰缂栧彿
null, //
null, // 璋冩嫧椤圭洰缂栧彿
@@ -497,9 +513,9 @@
null, // 鐗╂祦鍗曞彿
1L, // 璁㈠崟鐘舵��
1, // 鐘舵��
- 9527L, // 娣诲姞浜哄憳
+ userId, // 娣诲姞浜哄憳
now, // 娣诲姞鏃堕棿
- 9527L, // 淇敼浜哄憳
+ userId, // 淇敼浜哄憳
now, // 淇敼鏃堕棿
null // 澶囨敞
);
@@ -516,9 +532,9 @@
orderDetl.setAnfme(anfme);
orderDetl.setOrderId(order.getId());
orderDetl.setOrderNo(order.getOrderNo());
- orderDetl.setCreateBy(9527L);
+ orderDetl.setCreateBy(userId);
orderDetl.setCreateTime(now);
- orderDetl.setUpdateBy(9527L);
+ orderDetl.setUpdateBy(userId);
orderDetl.setUpdateTime(now);
orderDetl.setStatus(1);
orderDetl.setQty(0.0D);
--
Gitblit v1.9.1