From 1443d5a84a4df99d9a86ac04c904554e91ae8271 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期日, 12 四月 2026 15:35:06 +0800
Subject: [PATCH] 1.针对7.3接口文档，新增了几个字段需要加入到组托档中，不额外加字段 2.针对7.11接口文档，对outOrder方法进行重写，batchSeq在wrkMast表中新增一个字段放，entryWmsCode、outDoorNo这两个在wrkDetl中找两个字段存放 3.针对7.7接口文档，上报时加上orderId出库单号 4.针对7.9接口文档，wcs会先请求wms，只需要palletId托盘码，errorMsg错误信息；wms转发给加上orderId出库单号转发给ERP 5.针对7.10接口文档，ERP先按照这个文档发给wms，wms再发给wcs，发给wcs这块先不写
---
src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java | 34 ++++++++++++++++++++++++++++------
1 files changed, 28 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
index 36893e3..c400bd2 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
@@ -2,10 +2,7 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
-import com.zy.asrs.entity.BasArmMast;
-import com.zy.asrs.entity.WaitPakin;
-import com.zy.asrs.entity.WrkDetl;
-import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.entity.*;
import com.zy.asrs.service.*;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
@@ -43,8 +40,11 @@
@Autowired
private BasArmMastLogService basArmMastLogService;
@Autowired
+ private BasAgvMastLogService basAgvMastLogService;
+ @Autowired
private BasArmMastService basArmMastService;
-
+ @Autowired
+ private BasAgvMastService basAgvMastService;
@Transactional
public ReturnT<String> start(WrkMast wrkMast) {
try {
@@ -133,8 +133,9 @@
@Transactional
public ReturnT<String> startArm(BasArmMast basArmMast) {
try {
+ BasArmMastLog basArmMastLog = new BasArmMastLog(basArmMast);
// 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
- if (!basArmMastLogService.save(basArmMast.getId())) {
+ if (!basArmMastLogService.insert(basArmMastLog)) {
exceptionHandle("淇濆瓨ARM宸ヤ綔鍘嗗彶妗id={0}]澶辫触", basArmMast.getId());
}
// 鍒犻櫎宸ヤ綔涓绘。
@@ -150,4 +151,25 @@
return SUCCESS;
}
+ @Transactional
+ public ReturnT<String> startAgv(BasAgvMast basAgvMast) {
+ try {
+ BasAgvMastLog basAgvMastLog = new BasAgvMastLog(basAgvMast);
+ // 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
+ if (!basAgvMastLogService.insert(basAgvMastLog)) {
+ exceptionHandle("淇濆瓨ARM宸ヤ綔鍘嗗彶妗id={0}]澶辫触", basAgvMast.getId());
+ }
+ // 鍒犻櫎宸ヤ綔涓绘。
+ if (!basAgvMastService.deleteById(basAgvMast)) {
+ exceptionHandle("鍒犻櫎ARM宸ヤ綔涓绘。[id={0}]澶辫触", basAgvMast.getId());
+ }
+ } catch (Exception e) {
+ log.error("fail", e);
+ e.printStackTrace();
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return FAIL.setMsg(e.getMessage());
+ }
+ return SUCCESS;
+ }
+
}
--
Gitblit v1.9.1