From 4eb8d259b622226eb275666b0b06e7b19d5236f9 Mon Sep 17 00:00:00 2001
From: L <L@123>
Date: 星期四, 18 九月 2025 09:40:04 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 54 insertions(+), 2 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 40251b3..66b36b5 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -1,5 +1,6 @@
package com.zy.asrs.service.impl;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.DateUtils;
@@ -49,6 +50,10 @@
private TagService tagService;
@Autowired
private TagMapper tagMapper;
+ @Autowired
+ private BasArmService basArmService;
+ @Autowired
+ private BasArmMastService basArmMastService;
@Override
@Transactional
@@ -564,7 +569,7 @@
} else {
tagId = tagService.getTop().getId();
}
- mat.sync(param);
+ mat.sync(matParam);
// mat.setMatnr(param.getMatnr());
// mat.setMaktx(param.getMaktx());
// mat.setSpecs(param.getSpecs());
@@ -580,7 +585,7 @@
log.info("鍚屾鏂扮墿鏂橻鍟嗗搧缂栧彿锛歿}]", mat.getMatnr());
}
} else {
- mat.sync(param);
+ mat.sync(matParam);
if (!matService.update(mat, new EntityWrapper<Mat>().eq("matnr",matParam.getMatnr()))) {
throw new CoolException("鏇存柊宸插瓨鍦ㄥ晢鍝佷俊鎭け璐ワ紝璇疯仈绯荤鐞嗗憳");
}
@@ -589,4 +594,51 @@
}
+ @Override
+ @Transactional
+ public void taskArmReport(TaskArmReportParam param) {
+ BasArmMast basArmMast = new BasArmMast(param);
+ List<BasArm> basArmList = basArmService.selectList(new EntityWrapper<BasArm>().eq("sorting_line", basArmMast.getStaNo()));
+ for (BasArm basArm : basArmList) {
+ if (basArm.getStatus()!=1){
+ continue;
+ }
+ basArmMast.setArmNo(basArm.getArmNo());
+ basArmMast.setStaNo(basArm.getStaNo());
+ }
+ basArmMastService.insert(basArmMast);
+ }
+
+ @Override
+ @Transactional
+ public void taskArmCycleResult(TaskArmCycleResultParam param) {
+ BasArmMast basArmMast = basArmMastService.selectOne(
+ new EntityWrapper<BasArmMast>()
+ .eq("sorting_line", param.getStaNo())
+ .eq("status", 1)
+ );
+ if (Cools.isEmpty(basArmMast)){
+ throw new CoolException("鏈煡璇㈠埌鐩稿叧鏈烘鑷傛媶鐮佸灈浠诲姟锛侊紒锛�"+ JSON.toJSONString(param));
+ }
+
+ basArmMast.setStatus(2);
+ basArmMastService.updateById(basArmMast);
+ }
+
+ @Override
+ @Transactional
+ public void taskArmWorkspaceStatus(TaskArmWorkspaceStatusParam param) {
+ BasArmMast basArmMast = basArmMastService.selectOne(
+ new EntityWrapper<BasArmMast>()
+ .eq("sta_no", Integer.getInteger(param.getId()))
+ .eq("status", 2)
+ );
+ if (Cools.isEmpty(basArmMast)){
+ throw new CoolException("鏈煡璇㈠埌鐩稿叧鏈烘鑷傛媶鐮佸灈浠诲姟锛侊紒锛�"+ JSON.toJSONString(param));
+ }
+
+// basArmMast.setStatus(2);
+// basArmMastService.updateArmMastStatus(1,basArm.getSortingLine(),3,4);
+ }
+
}
--
Gitblit v1.9.1