From 6ffb8e752717f0408ce01682343cfff1947f7cef Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期四, 19 九月 2024 09:35:33 +0800
Subject: [PATCH] #
---
zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/service/impl/ApiServiceImpl.java | 259 ++++++++++++++++++++++++++++++---------------------
1 files changed, 154 insertions(+), 105 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 2e96f16..a1db44c 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
@@ -89,39 +89,48 @@
if (!orderService.save(order)) {
throw new CoolException("鐢熸垚鍗曟嵁涓绘。澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
- // 鍗曟嵁鏄庣粏妗�
- List<DetlDto> list = new ArrayList<>();
- List<DetlDto> orderDetails = param.getOrderDetails();
- for (DetlDto detail : orderDetails) {
- DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getAnfme());
- if (DetlDto.has(list, dto)) {
- DetlDto detlDto = DetlDto.find(list, dto.getMatnr(), dto.getBatch());
- assert detlDto != null;
- detlDto.setAnfme(detlDto.getAnfme() + detail.getAnfme());
- } else {
- list.add(dto);
- }
- }
- for (DetlDto detlDto : list) {
- Mat mat = matService.getOne(new LambdaQueryWrapper<Mat>().eq(Mat::getMatnr, detlDto.getMatnr()).eq(Mat::getHostId, param.getHostId()));
+ List<GenerateOrderMatParam> mats = param.getMats();
+ for (GenerateOrderMatParam matParam : mats) {
+ Mat mat = matService.getOne(new LambdaQueryWrapper<Mat>().eq(Mat::getMatnr, matParam.getMatnr()).eq(Mat::getHostId, param.getHostId()));
if (Cools.isEmpty(mat)) {
- throw new CoolException(detlDto.getMatnr() + "缂栧彿鍟嗗搧妫�绱㈠け璐ワ紝璇峰厛娣诲姞鍟嗗搧");
+ throw new CoolException(matParam.getMatnr() + "缂栧彿鍟嗗搧妫�绱㈠け璐ワ紝璇峰厛娣诲姞鍟嗗搧");
}
- OrderDetl orderDetl = new OrderDetl();
- orderDetl.sync(mat);
- orderDetl.setBatch(detlDto.getBatch());
- orderDetl.setAnfme(detlDto.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::getBatch,matParam.getBatch())
+ .eq(OrderDetl::getThreeCode, matParam.getWarehouse()).eq(OrderDetl::getSupp,matParam.getOrigin())
+ .eq(OrderDetl::getSuppCode, matParam.getOriginNo()).eq(OrderDetl::getUnit,matParam.getUnit())
+ );
+ 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("鏇存柊鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
+ }
}
+
}
}
@@ -181,30 +190,21 @@
if (!orderService.save(order)) {
throw new CoolException("鐢熸垚鍗曟嵁涓绘。澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
- // 鍗曟嵁鏄庣粏妗�
- List<DetlDto> list = new ArrayList<>();
- List<DetlDto> orderDetails = param.getOrderDetails();
- for (DetlDto detail : orderDetails) {
- DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getAnfme());
- if (DetlDto.has(list, dto)) {
- DetlDto detlDto = DetlDto.find(list, dto.getMatnr(), dto.getBatch());
- assert detlDto != null;
- detlDto.setAnfme(detlDto.getAnfme() + detail.getAnfme());
- } else {
- list.add(dto);
- }
- }
- for (DetlDto detlDto : list) {
- Mat mat = matService.getOne(new LambdaQueryWrapper<Mat>().eq(Mat::getMatnr, detlDto.getMatnr()).eq(Mat::getHostId, param.getHostId()));
+ List<GenerateOrderMatParam> mats = param.getMats();
+ for (GenerateOrderMatParam matParam : mats) {
+ Mat mat = matService.getOne(new LambdaQueryWrapper<Mat>().eq(Mat::getMatnr, matParam.getMatnr()).eq(Mat::getHostId, param.getHostId()));
if (Cools.isEmpty(mat)) {
- throw new CoolException(detlDto.getMatnr() + "缂栧彿鍟嗗搧妫�绱㈠け璐ワ紝璇峰厛娣诲姞鍟嗗搧");
+ throw new CoolException(matParam.getMatnr() + "缂栧彿鍟嗗搧妫�绱㈠け璐ワ紝璇峰厛娣诲姞鍟嗗搧");
}
OrderDetl orderDetl = new OrderDetl();
orderDetl.sync(mat);
- orderDetl.setBatch(detlDto.getBatch());
- orderDetl.setAnfme(detlDto.getAnfme());
+ 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);
@@ -271,6 +271,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());
}
@@ -283,63 +301,6 @@
if (!Cools.isEmpty(matParam.getSpecs())) {
mat.setSpecs(matParam.getSpecs());
}
- if (!Cools.isEmpty(matParam.getModel())) {
- mat.setModel(matParam.getModel());
- }
- if (!Cools.isEmpty(matParam.getColor())) {
- mat.setColor(matParam.getColor());
- }
- if (!Cools.isEmpty(matParam.getBrand())) {
- mat.setBrand(matParam.getBrand());
- }
- if (!Cools.isEmpty(matParam.getUnit())) {
- mat.setUnit(matParam.getUnit());
- }
- if (!Cools.isEmpty(matParam.getPrice())) {
- mat.setPrice(matParam.getPrice());
- }
- if (!Cools.isEmpty(matParam.getSku())) {
- mat.setSku(matParam.getSku());
- }
- if (!Cools.isEmpty(matParam.getUnits())) {
- mat.setUnits(matParam.getUnits());
- }
- if (!Cools.isEmpty(matParam.getBarcode())) {
- mat.setBarcode(matParam.getBarcode());
- }
- if (!Cools.isEmpty(matParam.getOrigin())) {
- mat.setOrigin(matParam.getOrigin());
- }
- if (!Cools.isEmpty(matParam.getManu())) {
- mat.setManu(matParam.getManu());
- }
- if (!Cools.isEmpty(matParam.getManuDate())) {
- mat.setManuDate(matParam.getManuDate());
- }
- if (!Cools.isEmpty(matParam.getItemNum())) {
- mat.setItemNum(matParam.getItemNum());
- }
- if (!Cools.isEmpty(matParam.getWeight())) {
- mat.setWeight(matParam.getWeight());
- }
- if (!Cools.isEmpty(matParam.getLength())) {
- mat.setLength(matParam.getLength());
- }
- if (!Cools.isEmpty(matParam.getVolume())) {
- mat.setVolume(matParam.getVolume());
- }
- if (!Cools.isEmpty(matParam.getThreeCode())) {
- mat.setThreeCode(matParam.getThreeCode());
- }
- if (!Cools.isEmpty(matParam.getSupp())) {
- mat.setSupp(matParam.getSupp());
- }
- if (!Cools.isEmpty(matParam.getSuppCode())) {
- mat.setSuppCode(matParam.getSuppCode());
- }
- if (!Cools.isEmpty(matParam.getDeadTime())) {
- mat.setDeadTime(matParam.getDeadTime());
- }
if (!Cools.isEmpty(matParam.getMemo())) {
mat.setMemo(matParam.getMemo());
}
@@ -349,6 +310,94 @@
mat.setStatus(1);
}
+ if (!Cools.isEmpty(matParam.getMainHost())) {
+ mat.setMainHost(matParam.getMainHost());
+ }
+ if (!Cools.isEmpty(matParam.getMainSource())) {
+ mat.setMainSource(matParam.getMainSource());
+ }
+ if (!Cools.isEmpty(matParam.getBarcode())) {
+ mat.setBarcode(matParam.getBarcode());
+ }
+ if (!Cools.isEmpty(matParam.getCyclePickCode())) {
+ mat.setCyclePickCode(matParam.getCyclePickCode());
+ }
+ if (!Cools.isEmpty(matParam.getLocationStock())) {
+ mat.setLocationStock(matParam.getLocationStock());
+ }
+ if (!Cools.isEmpty(matParam.getMaterial())) {
+ mat.setMaterial(matParam.getMaterial());
+ }
+ if (!Cools.isEmpty(matParam.getModel())) {
+ mat.setModel(matParam.getModel());
+ }
+ if (!Cools.isEmpty(matParam.getDecrees())) {
+ mat.setDecrees(matParam.getDecrees());
+ }
+ if (!Cools.isEmpty(matParam.getWeight())) {
+ mat.setWeight(matParam.getWeight());
+ }
+ if (!Cools.isEmpty(matParam.getImgNum())) {
+ mat.setImgNum(matParam.getImgNum());
+ }
+ if (!Cools.isEmpty(matParam.getPurchasingUnits())) {
+ mat.setPurchasingUnits(matParam.getPurchasingUnits());
+ }
+ if (!Cools.isEmpty(matParam.getProcessNumber())) {
+ mat.setProcessNumber(matParam.getProcessNumber());
+ }
+ if (!Cools.isEmpty(matParam.getBom())) {
+ mat.setBom(matParam.getBom());
+ }
+ if (!Cools.isEmpty(matParam.getSafeNum())) {
+ mat.setSafeNum(matParam.getSafeNum());
+ }
+ if (!Cools.isEmpty(matParam.getMiniCount())) {
+ mat.setMiniCount(matParam.getMiniCount());
+ }
+ if (!Cools.isEmpty(matParam.getReplenishmentNum())) {
+ mat.setReplenishmentNum(matParam.getReplenishmentNum());
+ }
+ if (!Cools.isEmpty(matParam.getTmp1())) {
+ mat.setTmp1(matParam.getTmp1());
+ }
+ if (!Cools.isEmpty(matParam.getTmp2())) {
+ mat.setTmp2(matParam.getTmp2());
+ }
+ if (!Cools.isEmpty(matParam.getTmp3())) {
+ mat.setTmp3(matParam.getTmp3());
+ }
+ if (!Cools.isEmpty(matParam.getRestockDemand())) {
+ mat.setRestockDemand(matParam.getRestockDemand());
+ }
+ if (!Cools.isEmpty(matParam.getLapse())) {
+ mat.setLapse(matParam.getLapse());
+ }
+ if (!Cools.isEmpty(matParam.getShortcuts())) {
+ mat.setShortcuts(matParam.getShortcuts());
+ }
+ if (!Cools.isEmpty(matParam.getUnits())) {
+ mat.setUnits(matParam.getUnits());
+ }
+ if (!Cools.isEmpty(matParam.getLength())) {
+ mat.setLength(matParam.getLength());
+ }
+ if (!Cools.isEmpty(matParam.getWidth())) {
+ mat.setWidth(matParam.getWidth());
+ }
+ if (!Cools.isEmpty(matParam.getHeight())) {
+ mat.setHeight(matParam.getHeight());
+ }
+ if (!Cools.isEmpty(matParam.getAccountingClass())) {
+ mat.setAccountingClass(matParam.getAccountingClass());
+ }
+ if (!Cools.isEmpty(matParam.getBatch())) {
+ mat.setBatch(matParam.getBatch());
+ }
+ if (!Cools.isEmpty(matParam.getInventoryAccount())) {
+ mat.setInventoryAccount(matParam.getInventoryAccount());
+ }
+
if (matService.save(mat)) {
count++;
}
--
Gitblit v1.9.1