From da3bbf602cf91249b31c8b01eba0f5c2bf9edea7 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期四, 11 九月 2025 13:01:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jshdasrs' into jshdasrs
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 23 +++++++++++++++++++++--
1 files changed, 21 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..4df751c 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -49,6 +49,10 @@
private TagService tagService;
@Autowired
private TagMapper tagMapper;
+ @Autowired
+ private BasArmService basArmService;
+ @Autowired
+ private BasArmMastService basArmMastService;
@Override
@Transactional
@@ -564,7 +568,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 +584,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 +593,19 @@
}
+ @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);
+ }
+
}
--
Gitblit v1.9.1