From d60e84cbedb554555578f071de95c4a8049183db Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期五, 13 六月 2025 15:16:43 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/BasJarMastLogController.java | 42 +++++++++++++++++++++++++++++++++---------
1 files changed, 33 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasJarMastLogController.java b/src/main/java/com/zy/asrs/controller/BasJarMastLogController.java
index a531d77..cba3e67 100644
--- a/src/main/java/com/zy/asrs/controller/BasJarMastLogController.java
+++ b/src/main/java/com/zy/asrs/controller/BasJarMastLogController.java
@@ -6,18 +6,13 @@
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.core.common.DateUtils;
-import com.zy.asrs.entity.BasJarMast;
-import com.zy.asrs.entity.BasJarMastLog;
-import com.zy.asrs.entity.WrkDetl;
-import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.entity.*;
import com.zy.asrs.entity.vo.JarMastTableVo;
-import com.zy.asrs.service.BasJarMastLogService;
+import com.zy.asrs.service.*;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.R;
-import com.zy.asrs.service.WrkDetlService;
-import com.zy.asrs.service.WrkMastService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -33,6 +28,10 @@
private WrkMastService wrkMastService;
@Autowired
private WrkDetlService wrkDetlService;
+ @Autowired
+ private WrkMastLogService wrkMastLogService;
+ @Autowired
+ private WrkDetlLogService wrkDetlLogService;
@RequestMapping(value = "/basJarMastLog/historicalTasks/auth")
@ManagerAuth
@@ -42,18 +41,43 @@
return R.error("鏈煡璇㈠埌淇℃伅");
}
ArrayList<JarMastTableVo> jarMastTableVos = new ArrayList<>();
+ int idSign = 0;
for (BasJarMastLog jarMast : jarMasts) {
JarMastTableVo jarMastTableVo = new JarMastTableVo();
- WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", jarMast.getWrkNo()));
- List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", jarMast.getWrkNo()));
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", jarMast.getWrkNo()).eq("io_time",jarMast.getIoTime()));
+ if (Cools.isEmpty(wrkMast)){
+ wrkMast = new WrkMast();
+ WrkMastLog wrkMastLog = wrkMastLogService.selectOne(new EntityWrapper<WrkMastLog>().eq("wrk_no", jarMast.getWrkNo()).eq("io_time",jarMast.getIoTime()));
+ wrkMast.sync(wrkMastLog);
+ }
+ if (Cools.isEmpty(wrkMast)){
+ return R.error("鏈煡璇㈠埌浠诲姟鏁版嵁");
+ }
+ List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", jarMast.getWrkNo()).eq("io_time",jarMast.getIoTime()));
+ if (Cools.isEmpty(wrkMast) || Cools.isEmpty(wrkDetls)){
+ List<WrkDetlLog> wrkDetlLogs = wrkDetlLogService.selectList(new EntityWrapper<WrkDetlLog>().eq("wrk_no", jarMast.getWrkNo()).eq("io_time",jarMast.getIoTime()));
+ wrkDetls = new ArrayList<>();
+ for (WrkDetlLog wrkDetlLog : wrkDetlLogs){
+ WrkDetl wrkDetl = new WrkDetl();
+ wrkDetl.sync(wrkDetlLog);
+ wrkDetls.add(wrkDetl);
+ }
+ if (wrkDetls.isEmpty()){
+ WrkDetl wrkDetl = new WrkDetl();
+ wrkDetls.add(wrkDetl);
+ }
+ }
if (Cools.isEmpty(wrkMast) || Cools.isEmpty(wrkDetls)){
return R.error("鏈煡璇㈠埌浠诲姟鏁版嵁");
}
+ jarMastTableVo.setId(++idSign);
jarMastTableVo.setJarId(jarMast.getJarId());
jarMastTableVo.setJarWrkNo(jarMast.getWrkNo().toString());
jarMastTableVo.setStatus(jarMast.getStatus());
+ jarMastTableVo.setStatus$(jarMast.getStatus$());
jarMastTableVo.setMatnr(wrkDetls.get(0).getMatnr());
jarMastTableVo.setMaktx(wrkDetls.get(0).getMaktx());
+ jarMastTableVo.setWeight(wrkDetls.get(0).getWeight());
jarMastTableVos.add(jarMastTableVo);
}
return R.ok(jarMastTableVos);
--
Gitblit v1.9.1