From 1780c615347b980e06c81d37b2ca5533e0ed8166 Mon Sep 17 00:00:00 2001
From: cp <513960435@qq.com>
Date: 星期四, 19 九月 2024 14:02:58 +0800
Subject: [PATCH] #
---
zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/service/impl/ApiServiceImpl.java | 117 +++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 87 insertions(+), 30 deletions(-)
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/service/impl/ApiServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/service/impl/ApiServiceImpl.java
index 26c2a7b..ce49ffb 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/service/impl/ApiServiceImpl.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/service/impl/ApiServiceImpl.java
@@ -95,21 +95,41 @@
if (Cools.isEmpty(mat)) {
throw new CoolException(matParam.getMatnr() + "缂栧彿鍟嗗搧妫�绱㈠け璐ワ紝璇峰厛娣诲姞鍟嗗搧");
}
- OrderDetl orderDetl = new OrderDetl();
- orderDetl.sync(mat);
- orderDetl.setBatch(matParam.getBatch());
- orderDetl.setAnfme(matParam.getAnfme());
- orderDetl.setOrderId(order.getId());
- orderDetl.setOrderNo(order.getOrderNo());
- orderDetl.setCreateBy(9527L);
- orderDetl.setCreateTime(now);
- orderDetl.setUpdateBy(9527L);
- orderDetl.setUpdateTime(now);
- orderDetl.setStatus(1);
- orderDetl.setQty(0.0D);
- if (!orderDetlService.save(orderDetl)) {
- throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
+ OrderDetl orderDetl1 = orderDetlService.getOne(new LambdaQueryWrapper<OrderDetl>()
+ .eq(OrderDetl::getOrderNo, order.getOrderNo())
+ .eq(OrderDetl::getThreeCode, matParam.getWarehouse()).eq(OrderDetl::getSupp,matParam.getOrigin())
+ );
+ if (Cools.isEmpty(orderDetl1)){
+ OrderDetl orderDetl = new OrderDetl();
+ orderDetl.sync(mat);
+ orderDetl.setBatch(matParam.getBatch());
+ orderDetl.setAnfme(matParam.getAnfme());
+ orderDetl.setUnit(matParam.getUnit());
+ orderDetl.setThreeCode(matParam.getWarehouse());//浠撳簱鍙�
+ orderDetl.setSupp(matParam.getOrigin());//鏉ユ簮鍗曞彿
+ orderDetl.setSuppCode(matParam.getOriginNo());//鏉ユ簮搴忓彿
+ orderDetl.setOrderId(order.getId());
+ orderDetl.setOrderNo(order.getOrderNo());
+ orderDetl.setCreateBy(9527L);
+ orderDetl.setCreateTime(now);
+ orderDetl.setUpdateBy(9527L);
+ orderDetl.setUpdateTime(now);
+ orderDetl.setStatus(1);
+ orderDetl.setQty(0.0D);
+ if (!orderDetlService.save(orderDetl)) {
+ throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
+ }
+ } else {
+ orderDetl1.setAnfme(matParam.getAnfme());
+ orderDetl1.setUpdateBy(9527L);
+ orderDetl1.setUpdateTime(now);
+ orderDetl1.setStatus(1);
+ orderDetl1.setQty(0.0D);
+ if (!orderDetlService.updateById(orderDetl1)) {
+ throw new CoolException("鏇存柊鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
+ }
}
+
}
}
@@ -175,22 +195,41 @@
if (Cools.isEmpty(mat)) {
throw new CoolException(matParam.getMatnr() + "缂栧彿鍟嗗搧妫�绱㈠け璐ワ紝璇峰厛娣诲姞鍟嗗搧");
}
- OrderDetl orderDetl = new OrderDetl();
- orderDetl.sync(mat);
- orderDetl.setBatch(matParam.getBatch());
- orderDetl.setAnfme(matParam.getAnfme());
- orderDetl.setOrderId(order.getId());
- orderDetl.setOrderNo(order.getOrderNo());
- orderDetl.setCreateBy(9527L);
- orderDetl.setCreateTime(now);
- orderDetl.setUpdateBy(9527L);
- orderDetl.setUpdateTime(now);
- orderDetl.setStatus(1);
- orderDetl.setQty(0.0D);
- orderDetl.setHostId(param.getHostId());
- if (!orderDetlService.save(orderDetl)) {
- throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
+ OrderDetl orderDetl1 = orderDetlService.getOne(new LambdaQueryWrapper<OrderDetl>()
+ .eq(OrderDetl::getOrderNo, order.getOrderNo())
+ .eq(OrderDetl::getThreeCode, matParam.getWarehouse()).eq(OrderDetl::getSupp,matParam.getOrigin())
+ );
+ if (Cools.isEmpty(orderDetl1)){
+ OrderDetl orderDetl = new OrderDetl();
+ orderDetl.sync(mat);
+ orderDetl.setBatch(matParam.getBatch());
+ orderDetl.setAnfme(matParam.getAnfme());
+ orderDetl.setOrderId(order.getId());
+ orderDetl.setOrderNo(order.getOrderNo());
+ orderDetl.setThreeCode(matParam.getWarehouse());//浠撳簱鍙�
+ orderDetl.setSupp(matParam.getOrigin());//鏉ユ簮鍗曞彿
+ orderDetl.setSuppCode(matParam.getOriginNo());//鏉ユ簮搴忓彿
+ orderDetl.setCreateBy(9527L);
+ orderDetl.setCreateTime(now);
+ orderDetl.setUpdateBy(9527L);
+ orderDetl.setUpdateTime(now);
+ orderDetl.setStatus(1);
+ orderDetl.setQty(0.0D);
+ orderDetl.setHostId(param.getHostId());
+ if (!orderDetlService.save(orderDetl)) {
+ throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
+ }
+ } else {
+ orderDetl1.setAnfme(matParam.getAnfme());
+ orderDetl1.setUpdateBy(9527L);
+ orderDetl1.setUpdateTime(now);
+ orderDetl1.setStatus(1);
+ orderDetl1.setQty(0.0D);
+ if (!orderDetlService.save(orderDetl1)) {
+ throw new CoolException("鏇存柊鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
+ }
}
+
}
}
@@ -247,6 +286,24 @@
mat.setMatnr(matParam.getMatnr());//鐗╂枡鍙�
mat.setHostId(hostId);//浠撳簱ID
mat.setTagId(tag.getId());//鍒嗙被ID
+ if (!Cools.isEmpty(matParam.getShopCategory())) {
+ Tag shopTag = tagService.getOne(new LambdaQueryWrapper<Tag>()
+ .eq(Tag::getName, matParam.getShopCategory())
+ .eq(Tag::getHostId, hostId));
+ if (shopTag == null) {
+ //鍟嗗搧鍒嗙被涓虹┖锛屽垱寤哄晢鍝佸垎绫�
+ shopTag = new Tag();
+ shopTag.setName(matParam.getShopCategory());
+ shopTag.setParentId(tag.getId());
+ shopTag.setStatus(1);
+ shopTag.setHostId(hostId);
+ shopTag.setCreateTime(new Date());
+ shopTag.setUpdateTime(new Date());
+ tagService.save(shopTag);
+ }
+ mat.setTagId(shopTag.getId());//鍒嗙被ID
+ }
+
if (!Cools.isEmpty(matParam.getMaktx())) {
mat.setMaktx(matParam.getMaktx());
}
@@ -338,7 +395,7 @@
mat.setUnits(matParam.getUnits());
}
if (!Cools.isEmpty(matParam.getLength())) {
- mat.setLength(Double.parseDouble(matParam.getLength()));
+ mat.setLength(matParam.getLength());
}
if (!Cools.isEmpty(matParam.getWidth())) {
mat.setWidth(matParam.getWidth());
--
Gitblit v1.9.1