From 539a56279625242c497b4b4093f2defbb9d80334 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期四, 29 一月 2026 14:05:44 +0800
Subject: [PATCH] #i18n翻译
---
src/main/java/com/zy/asrs/service/impl/NodeServiceImpl.java | 114 ++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 77 insertions(+), 37 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/NodeServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/NodeServiceImpl.java
index e4049ed..27ad82d 100644
--- a/src/main/java/com/zy/asrs/service/impl/NodeServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/NodeServiceImpl.java
@@ -52,7 +52,7 @@
top.setUpdateTime(new Date());
Integer insert = this.baseMapper.insert(top);
if (insert == 0) {
- throw new CoolException("鏈嶅姟鍣ㄥ紓甯�");
+ throw new CoolException("response.server_exception");
}
}
return top;
@@ -85,36 +85,48 @@
node = nodeService.selectById(param.getNodeId());
}
if (node == null) {
- return R.error("璐т綅涓嶅瓨鍦�");
+ return R.error("response.node_not_exist");
}
if (Cools.isEmpty(param.getMats())) {
- return R.error("鍏ュ簱鐗╂枡涓嶈兘涓虹┖");
+ return R.error("response.inbound_material_empty");
}
Date now = new Date();
for (MatnrDto dto : param.getMats()) {
+
Mat mat = matService.selectByMatnr(dto.getMatnr());
if (mat == null) {
- throw new CoolException("鐗╂枡鏁版嵁閿欒锛岃鑱旂郴绠＄悊鍛�");
+ throw new CoolException("response.material_data_error");
}
- ManLocDetl manLocDetl = new ManLocDetl();
- manLocDetl.setLocNo(node.getUuid());
- manLocDetl.setNodeId(node.getId());
- manLocDetl.setZpallet(mat.getBarcode());
- manLocDetl.setAnfme(dto.getCount());
- manLocDetl.setMatnr(mat.getMatnr());
- manLocDetl.setMaktx(mat.getMaktx());
- manLocDetl.setName(mat.getName());
- manLocDetl.setSpecs(mat.getSpecs());
- manLocDetl.setModel(mat.getModel());
- manLocDetl.setBatch(mat.getBeBatch() + "");
- manLocDetl.setCreateTime(now);
- manLocDetl.setModiTime(now);
- manLocDetl.setCreateBy(userId);
- SaasUtils.insertLog(0,manLocDetl.getLocNo(),manLocDetl.getMatnr(), manLocDetl.getAnfme());
- manLocDetlService.insert(manLocDetl);
+ ManLocDetl check = manLocDetlService.selectOne(new EntityWrapper<ManLocDetl>()
+ .eq("loc_no", node.getUuid())
+ .eq("matnr", dto.getMatnr()));
+ if (check == null) {
+ ManLocDetl manLocDetl = new ManLocDetl();
+ manLocDetl.setLocNo(node.getUuid());
+ manLocDetl.setNodeId(node.getId());
+ manLocDetl.setZpallet(mat.getBarcode());
+ manLocDetl.setAnfme(dto.getCount());
+ manLocDetl.setMatnr(mat.getMatnr());
+ manLocDetl.setMaktx(mat.getMaktx());
+ manLocDetl.setName(mat.getName());
+ manLocDetl.setBatch(null);
+ manLocDetl.setSpecs(mat.getSpecs());
+ manLocDetl.setModel(mat.getModel());
+ manLocDetl.setCreateTime(now);
+ manLocDetl.setModiTime(now);
+ manLocDetl.setCreateBy(userId);
+ SaasUtils.insertLog(0,manLocDetl.getLocNo(),manLocDetl.getMatnr(), manLocDetl.getAnfme());
+ manLocDetlService.insert(manLocDetl);
+ }else {
+ check.setAnfme(dto.getCount() + check.getAnfme());
+ manLocDetlService.update(check,new EntityWrapper<ManLocDetl>()
+ .eq("loc_no", node.getUuid())
+ .eq("matnr", dto.getMatnr()));
+ }
+
}
- return R.ok("鍏ュ簱鎴愬姛");
+ return R.ok("response.inbound_success");
}
@Transactional
@@ -129,42 +141,70 @@
Node node = nodeService.selectOne(new EntityWrapper<Node>()
.eq("id", param.getNodeId()));
if (node == null) {
- return R.error("鎵句笉鍒拌搴撲綅,璇疯仈绯荤鐞嗗憳:" + param.getNodeId() );
+ R r = R.error("response.node_not_found");
+ r.put("nodeId", param.getNodeId());
+ return r;
}
if (manLocDetl == null) {
- return R.error("鐗╂枡:"+ param.getMatnr() + " 鍦ㄥ簱浣嶄腑涓嶅瓨鍦�");
+ R r = R.error("response.material_not_found");
+ r.put("matnr", param.getMatnr());
+ return r;
}
if (manLocDetl.getAnfme() - param.getCount() < 0) {
- return R.error("鐗╂枡:"+ param.getMatnr() + " 鍦ㄥ簱浣嶄腑鏁伴噺涓嶈冻");
- }else {
+ R r = R.error("response.quantity_insufficient");
+ r.put("matnr", param.getMatnr());
+ return r;
+ } else if (manLocDetl.getAnfme() - param.getCount() == 0) {
+ SaasUtils.insertLog(1,manLocDetl.getLocNo(), manLocDetl.getMatnr(),param.getCount());
+ manLocDetlService.delete(new EntityWrapper<ManLocDetl>()
+ .eq("loc_no",node.getUuid())
+ .eq("matnr",param.getMatnr()));
+ } else {
manLocDetl.setAnfme(manLocDetl.getAnfme() - param.getCount());
manLocDetlService.update(manLocDetl,new EntityWrapper<ManLocDetl>()
.eq("loc_no",node.getUuid())
.eq("matnr",param.getMatnr()));
- SaasUtils.insertLog(1,manLocDetl.getLocNo(), manLocDetl.getMatnr(),manLocDetl.getAnfme());
+ SaasUtils.insertLog(1,manLocDetl.getLocNo(), manLocDetl.getMatnr(),param.getCount());
}
}
}
- return R.ok("鍑哄簱鎴愬姛");
+ return R.ok("response.outbound_success");
}
@Transactional
@Override
public void locMove(String sourceLocNo, String targetLocNo, Long userId) {
- List<ManLocDetl> targets = manLocDetlService.selectList(new EntityWrapper<ManLocDetl>()
+ List<ManLocDetl> sourceManDetl = manLocDetlService.selectList(new EntityWrapper<ManLocDetl>()
.like("loc_no", sourceLocNo));
- for (ManLocDetl target : targets) {
- Node uuid = nodeService.selectOne(new EntityWrapper<Node>()
+ for (ManLocDetl source : sourceManDetl) {
+ Node targetNode = nodeService.selectOne(new EntityWrapper<Node>()
.eq("uuid", targetLocNo));
- if (uuid == null || uuid.equals("")) {
- throw new RuntimeException("鏃犳硶鏌ヨ鍒扮Щ搴撶殑鐩爣搴撲綅");
+ Node sourceNode = nodeService.selectOne(new EntityWrapper<Node>()
+ .eq("uuid", sourceLocNo));
+ if (targetNode == null || targetNode.equals("")) {
+ throw new RuntimeException("response.target_node_not_found");
}
- manLocDetlService.deleteById(target);
- target.setLocNo(uuid.getUuid());
- target.setNodeId(uuid.getId());
- SaasUtils.insertLog(2,target.getLocNo(), target.getMatnr(), target.getAnfme());
- manLocDetlService.insert(target);
+ ManLocDetl check = manLocDetlService.selectOne(new EntityWrapper<ManLocDetl>()
+ .eq("loc_no", targetNode.getUuid())
+ .eq("matnr", source.getMatnr()));
+ if (check == null) {
+ manLocDetlService.deleteById(source);
+ source.setLocNo(targetNode.getUuid());
+ source.setNodeId(targetNode.getId());
+
+ SaasUtils.insertLog(2,source.getLocNo(), source.getMatnr(), source.getAnfme());
+ manLocDetlService.insert(source);
+ }else {
+ check.setAnfme(check.getAnfme() + source.getAnfme());
+ manLocDetlService.update(check,new EntityWrapper<ManLocDetl>()
+ .eq("loc_no", targetNode.getUuid())
+ .eq("matnr", check.getMatnr()));
+ manLocDetlService.delete(new EntityWrapper<ManLocDetl>()
+ .eq("loc_no", sourceNode.getUuid())
+ .eq("matnr", source.getMatnr()));
+ }
+
}
}
}
--
Gitblit v1.9.1