From d04fe2f4e7fc1f46ef4e85e640eefdd9127b4db3 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期四, 11 十二月 2025 15:01:48 +0800
Subject: [PATCH] 入库单功能优化
---
src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java | 20 +++++++++++++-------
src/main/java/com/zy/asrs/utils/Utils.java | 18 ++++++++++++++----
src/main/java/com/zy/asrs/controller/OpenController.java | 13 ++++++-------
src/main/java/com/zy/asrs/entity/Mat.java | 2 ++
4 files changed, 35 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java b/src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java
index 84e5334..09c3ea4 100644
--- a/src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java
+++ b/src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java
@@ -27,6 +27,9 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Objects;
@@ -75,27 +78,30 @@
if (!Objects.isNull(matnr)) {
// 璁㈠崟鏃堕棿
if (Utils.isValidFormat(params.getUpdate_time(), "yyyy-MM-dd HH:mm:ss")) {
- Date date = DateUtils.convert(params.getUpdate_time(), "yyyy-MM-dd HH:mm:ss");
- matnr.setUpdateTime(date);
+ Date date1 = Utils.getFormateDate(params.getUpdate_time());
+ matnr.setUpdateTime(date1);
}
matnr.setMaktx(params.getPro_name());
- matnr.setVolume(Double.parseDouble(params.getPro_size()));
+ matnr.setSpecs(params.getPro_size());
matnr.setWeight(Double.parseDouble(params.getPro_wet()));
matnr.setSuppCode(params.getPro_id());
matnr.setTagId(MatLocType.getTag(params.getPro_type()));
matnr.setManu(params.getCompany_id());
if (!matService.updateById(matnr)) {
- throw new CoolException("鐗╂枡鏇存柊澶辫触锛侊紒");
+ throw new CoolException("鐗╂枡鏇存柊澶辫触鎴栨棤闇�鏇存柊锛侊紒");
}
} else {
+ if (Objects.isNull(matnr)) {
+ matnr = new Mat();
+ }
// 璁㈠崟鏃堕棿
if (Utils.isValidFormat(params.getUpdate_time(), "yyyy-MM-dd HH:mm:ss")) {
- Date date = DateUtils.convert(params.getUpdate_time(), "yyyy-MM-dd HH:mm:ss");
- matnr.setUpdateTime(date);
+ Date date1 = Utils.getFormateDate(params.getUpdate_time());
+ matnr.setUpdateTime(date1);
}
matnr.setMaktx(params.getPro_name());
matnr.setMatnr(params.getPro_komcode());
- matnr.setVolume(Double.parseDouble(params.getPro_size()));
+ matnr.setSpecs(params.getPro_size());
matnr.setWeight(Double.parseDouble(params.getPro_wet()));
matnr.setSuppCode(params.getPro_id());
matnr.setTagId(MatLocType.getTag(params.getPro_type()));
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 0225ee2..3875e7a 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -47,8 +47,9 @@
public Map<String, Object> agvPickupComplete(@RequestBody AgvTaskParam agvTaskParam, HttpServletRequest request) {
// DecimalFormat df = new DecimalFormat("0000");
// String wrkNo = "Ctu"+df.format(param.getWrkNo())+date.getTime()/1000;
- String wrkNo = agvTaskParam.getTaskCode().substring(3,7);
- Task task = taskService.selectOne(new EntityWrapper<Task>().eq("wrk_no", Integer.parseInt(wrkNo)));
+// String wrkNo = agvTaskParam.getTaskCode().substring(3,7);
+// Task task = taskService.selectOne(new EntityWrapper<Task>().eq("wrk_no", Integer.parseInt(wrkNo)));
+ Task task = taskService.selectOne(new EntityWrapper<Task>().eq("wrk_no", agvTaskParam.getTaskCode()));
if (Cools.isEmpty(task)) {
log.error("鏈煡璇㈠埌浠诲姟鍙峰搴旂殑鏁版嵁");
}
@@ -68,19 +69,17 @@
@AppAuth(memo = "AGV鏀捐揣瀹屾垚鎺ュ彛")
public Map<String, Object> agvTaskComplete(@RequestBody AgvTaskParam agvTaskParam,HttpServletRequest request) {
HashMap<String, Object> map = new HashMap<>();
- String wrkNo = agvTaskParam.getTaskCode().substring(3,7);
- Task task = taskService.selectOne(new EntityWrapper<Task>().eq("wrk_no", Integer.parseInt(wrkNo)));
+// String wrkNo = agvTaskParam.getTaskCode().substring(3,7);
+// Task task = taskService.selectOne(new EntityWrapper<Task>().eq("wrk_no", Integer.parseInt(wrkNo)));
+ Task task = taskService.selectOne(new EntityWrapper<Task>().eq("wrk_no", agvTaskParam.getTaskCode()));
if (Cools.isEmpty(task)) {
log.error("鏈煡璇㈠埌浠诲姟鍙峰搴旂殑鏁版嵁");
}
-
- taskService.updateById(task);
if (task.getIoType() < 100 ){
task.setWrkSts(4L);
}else {
task.setWrkSts(14L);
}
-
taskService.updateById(task);
map.put("code","0");
diff --git a/src/main/java/com/zy/asrs/entity/Mat.java b/src/main/java/com/zy/asrs/entity/Mat.java
index 47a31e0..f266c7b 100644
--- a/src/main/java/com/zy/asrs/entity/Mat.java
+++ b/src/main/java/com/zy/asrs/entity/Mat.java
@@ -7,6 +7,7 @@
import com.baomidou.mybatisplus.enums.IdType;
import com.core.common.Cools;
import com.core.common.SpringUtils;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.zy.api.enums.MatLocType;
import com.zy.asrs.enums.ContainerType;
import com.zy.asrs.service.BasContainerService;
@@ -306,6 +307,7 @@
@ApiModelProperty(value= "淇敼鏃堕棿")
@TableField("update_time")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
@ApiModelProperty("搴撲綅绫诲瀷")
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index 5535a49..3bcb9d4 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -18,10 +18,11 @@
import java.text.DecimalFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
/**
* Created by vincent on 2020/8/27
@@ -62,6 +63,15 @@
}
}
+ public static Date getFormateDate(String datestr) {
+ //瀛楃涓茶浆鏃ユ湡
+ DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+ LocalDateTime parse = LocalDateTime.parse(datestr, dateTimeFormatter);
+ Instant instant = parse.atZone(ZoneId.systemDefault()).toInstant();
+ Date date = Date.from(instant);
+ return date;
+ }
+
/**
* 鍒ゆ柇鏄惁涓烘繁搴撲綅
*/
--
Gitblit v1.9.1