From 75d0daa4f8dc2010ec92f35cac08a19d240ca45d Mon Sep 17 00:00:00 2001
From: ynhfasrs <ynhfasrs@qq.com>
Date: 星期五, 27 六月 2025 14:23:37 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 61 ++++++++++++++++++++++++++++++
1 files changed, 61 insertions(+), 0 deletions(-)
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 dfd82ab..4986366 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -6,6 +6,8 @@
import com.zy.asrs.domain.enums.TaskStatusType;
import com.zy.asrs.domain.enums.WorkNoType;
import com.zy.asrs.entity.*;
+import com.zy.asrs.entity.param.CrnStatusParam;
+import com.zy.asrs.entity.param.StationStatusParam;
import com.zy.asrs.entity.param.TaskCreateInParam;
import com.zy.asrs.entity.param.TaskCreateParam;
import com.zy.asrs.service.*;
@@ -24,6 +26,12 @@
private CommonService commonService;
@Autowired
private LocMastService locMastService;
+ @Autowired
+ private BasDevpService basDevpService;
+ @Autowired
+ private BasCrnpService basCrnpService;
+ @Autowired
+ private BasCrnErrorService basCrnErrorService;
@Override
public R taskCreate(TaskCreateParam param) {
@@ -73,6 +81,11 @@
locMast.setLocSts("R");
locMast.setModiTime(new Date());
locMastService.updateById(locMast);
+
+ LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", param.getTargetPoint()));
+ locMast2.setLocSts("S");
+ locMast2.setModiTime(new Date());
+ locMastService.updateById(locMast2);
}
if (!Cools.isEmpty(param.getMemo())) {
@@ -128,4 +141,52 @@
}
return R.ok();
}
+
+ @Override
+ public List<StationStatusParam> getStationStatus() {
+ List<StationStatusParam> data = new ArrayList<>();
+ List<BasDevp> list = basDevpService.selectList(new EntityWrapper<BasDevp>()
+ .in("dev_no", 102, 104, 106, 108, 203, 206, 209, 212));
+ for (BasDevp basDevp : list) {
+ String taskNo = "";
+ String barcode = "";
+ if (basDevp.getWrkNo() > 0) {
+ TaskWrk taskWrk = taskWrkService.selectByWrkNo(basDevp.getWrkNo());
+ if (taskWrk != null) {
+ taskNo = taskWrk.getTaskNo();
+ barcode = taskWrk.getBarcode();
+ }
+ }
+
+ StationStatusParam param = new StationStatusParam();
+ param.setStaNo(basDevp.getDevNo());
+ param.setTaskNo(taskNo);
+ param.setLoading(basDevp.getLoading());
+ param.setBarcode(barcode);
+
+ data.add(param);
+ }
+ return data;
+ }
+
+ @Override
+ public List<CrnStatusParam> getCrnStatus() {
+ List<CrnStatusParam> crnStatusParams = new ArrayList<>();
+ List<BasCrnp> basCrnps = basCrnpService.selectList(new EntityWrapper<>());
+ for (BasCrnp basCrnp:basCrnps){
+ CrnStatusParam crnStatusParam=new CrnStatusParam();
+ crnStatusParam.setCrnNo(basCrnp.getCrnNo());
+ crnStatusParam.setCrnSts(basCrnp.getCrnSts());
+ crnStatusParam.setErrorCode(basCrnp.getCrnErr());
+ BasCrnError error=basCrnErrorService.selectOne(new EntityWrapper<BasCrnError>().eq("error_code",basCrnp.getCrnErr()));
+ if(Cools.isEmpty(error)){
+ crnStatusParam.setErrorMsg("");
+ }else {
+ crnStatusParam.setErrorMsg(error.getErrName());
+ }
+ crnStatusParams.add(crnStatusParam);
+ }
+
+ return crnStatusParams;
+ }
}
--
Gitblit v1.9.1