From 571a106d5537acc98d5a0f65444c4172b945cf8d Mon Sep 17 00:00:00 2001
From: lsh <lsh>
Date: 星期四, 25 七月 2024 17:11:55 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/vo/JarStateTableVo.java | 4 ++
src/main/java/com/zy/asrs/controller/OpenController.java | 35 ++++++++++++++++-
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 38 +++++++++++++++++++
src/main/java/com/zy/asrs/service/OpenService.java | 3 +
4 files changed, 77 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 4c88b9e..cf3b4b0 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -7,11 +7,12 @@
import com.core.exception.CoolException;
import com.zy.asrs.entity.BasCrnp;
import com.zy.asrs.entity.BasDevp;
+import com.zy.asrs.entity.BasJar;
import com.zy.asrs.entity.param.*;
-import com.zy.asrs.service.BasCrnpService;
-import com.zy.asrs.service.BasDevpService;
-import com.zy.asrs.service.OpenService;
+import com.zy.asrs.entity.vo.JarStateTableVo;
+import com.zy.asrs.service.*;
import com.zy.common.model.DetlDto;
+import com.zy.common.model.enums.JarStatusType;
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -42,6 +43,8 @@
private BasDevpService basDevpService;
@Autowired
private BasCrnpService basCrnpService;
+ @Autowired
+ private BasJarService basJarService;
@PostMapping("/order/matSync/default/v1")
@AppAuth(memo = "鍟嗗搧淇℃伅鍚屾鎺ュ彛")
@@ -354,6 +357,32 @@
}
return R.ok(list);
}
+
+ //璁惧鐘舵�佹煡璇㈡帴鍙�
+ @PostMapping("/jarStatus")
+ @AppAuth(memo = "纭寲缃愮姸鎬佹煡璇㈡帴鍙�")
+ @Transactional
+ public R jarStatus(@RequestHeader String appkey,
+ HttpServletRequest request) {
+ auth(appkey, "纭寲缃愮姸鎬佹煡璇㈡帴鍙�", request);
+ List<JarStateTableVo> list = new ArrayList<>();
+ List<BasJar> jars = basJarService.selectList(new EntityWrapper<BasJar>().orderBy("jar_no"));
+ for (BasJar basJar : jars) {
+ // 琛ㄦ牸琛�
+ JarStateTableVo vo = new JarStateTableVo();
+ vo.setJarNo(basJar.getJarNo()); // JAR鍙�
+ list.add(vo);
+
+ vo.setJarMode(basJar.getJarMode$()); // 妯″紡鐘舵��
+ vo.setJarStatus(JarStatusType.get(basJar.getJarStatus()).desc); // 鐘舵��
+ vo.setJarNo(basJar.getJarNo()); // 宸ヤ綅1浠诲姟鍙�
+ vo.setRegion(basJar.getRegion());
+ vo.setJarCode(basJar.getJarCode());
+ vo.setJarErr(basJar.getJarErr$());
+ vo.setJarMastTableVoList(openService.getJatIdList(vo.getJarNo()));
+ }
+ return R.ok().add(list);
+ }
/*...........................浜冲窞鐓滄槦..............浠ヤ笂.............浜冲窞鐓滄槦...........................*/
}
diff --git a/src/main/java/com/zy/asrs/entity/vo/JarStateTableVo.java b/src/main/java/com/zy/asrs/entity/vo/JarStateTableVo.java
index 1a36541..26ffe8c 100644
--- a/src/main/java/com/zy/asrs/entity/vo/JarStateTableVo.java
+++ b/src/main/java/com/zy/asrs/entity/vo/JarStateTableVo.java
@@ -2,6 +2,8 @@
import lombok.Data;
+import java.util.List;
+
@Data
public class JarStateTableVo {
// RGV鍙�
@@ -27,4 +29,6 @@
//寮傚父浠ｇ爜
private String jarErr = "-";
+
+ private List<JarMastTableVo> jarMastTableVoList;
}
diff --git a/src/main/java/com/zy/asrs/service/OpenService.java b/src/main/java/com/zy/asrs/service/OpenService.java
index 0cbc89c..7d4c27f 100644
--- a/src/main/java/com/zy/asrs/service/OpenService.java
+++ b/src/main/java/com/zy/asrs/service/OpenService.java
@@ -3,6 +3,7 @@
import com.zy.asrs.entity.param.*;
import com.zy.asrs.entity.result.OpenOrderCompeteResult;
import com.zy.asrs.entity.result.StockVo;
+import com.zy.asrs.entity.vo.JarMastTableVo;
import java.util.List;
@@ -61,4 +62,6 @@
void smallContainers(SmallCompleteParam param);
+ List<JarMastTableVo> getJatIdList(Integer id);
+
}
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 8d470ee..908eb25 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -11,6 +11,7 @@
import com.zy.asrs.entity.param.*;
import com.zy.asrs.entity.result.OpenOrderCompeteResult;
import com.zy.asrs.entity.result.StockVo;
+import com.zy.asrs.entity.vo.JarMastTableVo;
import com.zy.asrs.mapper.TagMapper;
import com.zy.asrs.service.*;
import com.zy.asrs.task.core.ReturnT;
@@ -30,6 +31,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.RequestParam;
import java.util.ArrayList;
import java.util.Date;
@@ -86,6 +88,8 @@
private WorkService workService;
@Autowired
private BareBoardHandler bareBoardHandler;
+ @Autowired
+ private BasJarMastService basJarMastService;
@Override
@Transactional
@@ -1494,5 +1498,39 @@
}
}
+ /*
+ * 鑾峰彇纭寲缃愪换鍔′俊鎭� //
+ * */
+ @Override
+ @Transactional
+ public List<JarMastTableVo> getJatIdList(Integer id) {
+ List<BasJarMast> jarMasts = basJarMastService.selectList(new EntityWrapper<BasJarMast>().eq("jar_id", id));
+ if (Cools.isEmpty(jarMasts)){
+ return new ArrayList<JarMastTableVo>();
+ }
+ ArrayList<JarMastTableVo> jarMastTableVos = new ArrayList<>();
+ for (BasJarMast 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()));
+ if (wrkDetls.isEmpty()){
+ WrkDetl wrkDetl = new WrkDetl();
+ wrkDetls.add(wrkDetl);
+ }
+ if (Cools.isEmpty(wrkMast) || Cools.isEmpty(wrkDetls)){
+ continue;
+ }
+ 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 jarMastTableVos;
+ }
+
/*...........................浜冲窞鐓滄槦..............浠ヤ笂.............浜冲窞鐓滄槦...........................*/
}
--
Gitblit v1.9.1