From 1c0dbad152362ac704a27ecfc5b5d08247385d87 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 21 十月 2025 17:12:48 +0800
Subject: [PATCH] 13
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 584 ++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 365 insertions(+), 219 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 96242bc..5456a63 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -1,8 +1,8 @@
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;
import com.core.common.SnowflakeIdWorker;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
@@ -20,7 +20,6 @@
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.Date;
import java.util.List;
@@ -44,25 +43,48 @@
@Autowired
private LocDetlService locDetlService;
@Autowired
- private PackService packService;
- @Autowired
private TagService tagService;
@Autowired
private TagMapper tagMapper;
@Autowired
private WrkMastService wrkMastService;
+ @Autowired
+ private WrkMastLogServiceImpl wrkMastLogService;
+ @Autowired
+ private WrkDetlLogServiceImpl wrkDetlLogService;
+
+ @Autowired
+ private ApiLogService apiLogService;
+
+ public void callApiLogSaveOrder(Object order, String name, Boolean bool) {
+ apiLogService.save(name, "null", null, null,
+ JSON.toJSONString(order),
+ null, bool);
+ }
@Override
@Transactional
public void pakinOrderCreate(OpenOrderPakinParam param) {
- Order order = orderService.selectByNo(param.getOrderNo());
- if (!Cools.isEmpty(order)) {
- throw new CoolException(param.getOrderNo() + "鍗曟嵁宸插瓨鍦紝璇峰嬁閲嶅鎻愪氦");
+ callApiLogSaveOrder(param, "鍏ュ簱鍗�", true);
+
+ OrderPakin order = orderService.selectByNo(param.getOrderNo());
+ if (!Cools.isEmpty(order) && order.getSettle() != 1) {
+ throw new CoolException(param.getOrderNo() + "鍗曟嵁宸叉湁宸ヤ綔浠诲姟");
}
- DocType docType = docTypeService.selectOrAdd(param.getOrderType(), Boolean.TRUE);
+ if (!Cools.isEmpty(order)) {
+ boolean orderNo = orderService.delete(new EntityWrapper<OrderPakin>().eq("order_no", param.getOrderNo()));
+ boolean orderNo1 = orderDetlService.delete(new EntityWrapper<OrderDetlPakout>().eq("order_no", param.getOrderNo()));
+
+ }
+ DocType docType;
+ if (param.getOrderType().equals("璋冩嫧鍗�")) {
+ docType = docTypeService.selectOrAdd("璋冩嫧鍗�(鍏�)", Boolean.TRUE);
+ } else {
+ docType = docTypeService.selectOrAdd(param.getOrderType(), Boolean.TRUE);
+ }
Date now = new Date();
// 鍗曟嵁涓绘。
- order = new Order(
+ order = new OrderPakin(
String.valueOf(snowflakeIdWorker.nextId()), // 缂栧彿[闈炵┖]
param.getOrderNo(), // 璁㈠崟缂栧彿
param.getInboundDate(), // 鍗曟嵁鏃ユ湡
@@ -98,14 +120,17 @@
now, // 淇敼鏃堕棿
null // 澶囨敞
);
+ //order.setShipCode(String.valueOf(param.getDetails().get(0).getQuality()));
if (!orderService.insert(order)) {
throw new CoolException("鐢熸垚鍗曟嵁涓绘。澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
// 鍗曟嵁鏄庣粏妗�
List<DetlDto> list = new ArrayList<>();
- List<DetlDto> orderDetails = param.getOrderDetails();
+ List<DetlDto> orderDetails = param.getDetails();
for (DetlDto detail : orderDetails) {
- DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getAnfme());
+ DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getAnfme(), detail.getFromOrderNo()
+ , detail.getMark(), detail.getCustomer(), detail.getSuppName(), detail.getTemp1(), detail.getTemp2(), detail.getTemp3(), detail.getTemp4());
+ dto.setQuality(detail.getQuality());
if (DetlDto.has(list, dto)) {
DetlDto detlDto = DetlDto.find(list, dto.getMatnr(), dto.getBatch());
assert detlDto != null;
@@ -119,22 +144,30 @@
if (Cools.isEmpty(mat)) {
throw new CoolException(detlDto.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);
- orderDetl.setThreeCode(detlDto.getOrderNo());
- orderDetl.setSuppCode(detlDto.getFromOrderNo());
- orderDetl.setMemo(detlDto.getMemo());
- if (!orderDetlService.insert(orderDetl)) {
+ OrderDetlPakout orderDetlPakout = new OrderDetlPakout();
+ orderDetlPakout.sync(mat);
+ orderDetlPakout.setBatch(detlDto.getBatch());
+ orderDetlPakout.setAnfme(detlDto.getAnfme());
+ orderDetlPakout.setOrderId(order.getId());
+ orderDetlPakout.setOrderNo(order.getOrderNo());
+ orderDetlPakout.setCreateBy(9527L);
+ orderDetlPakout.setCreateTime(now);
+ orderDetlPakout.setUpdateBy(9527L);
+ orderDetlPakout.setUpdateTime(now);
+ orderDetlPakout.setStatus(1);
+ orderDetlPakout.setQty(0.0D);
+ orderDetlPakout.setThreeCode(detlDto.getOrderNo());
+ orderDetlPakout.setSuppCode(detlDto.getFromOrderNo());
+ orderDetlPakout.setMemo(detlDto.getMemo());
+ orderDetlPakout.setManu(detlDto.getMark());
+ orderDetlPakout.setSupp(detlDto.getSuppName()); //渚涘簲鍟�
+ orderDetlPakout.setSku(detlDto.getCustomer());
+ orderDetlPakout.setTemp1(detlDto.getTemp1());
+ orderDetlPakout.setTemp2(detlDto.getTemp2());
+ orderDetlPakout.setTemp3(detlDto.getTemp3());
+ orderDetlPakout.setTemp4(detlDto.getTemp4());
+ orderDetlPakout.setInspect(detlDto.getQuality());
+ if (!orderDetlService.insert(orderDetlPakout)) {
throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
}
@@ -143,19 +176,20 @@
@Override
@Transactional
public List<OpenOrderCompeteResult> pakinOrderComplete(OpenOrderCompleteParam param) {
+ callApiLogSaveOrder(param, "鍑哄簱鍗�", true);
List<OpenOrderCompeteResult> results = new ArrayList<>();
if (!Cools.isEmpty(param) && !Cools.isEmpty(param.getOrderNo())) {
// 鎸囧畾璁㈠崟
- Order order = orderService.selectByNo(param.getOrderNo());
+ OrderPakin order = orderService.selectByNo(param.getOrderNo());
if (null != order) {
OpenOrderCompeteResult result = new OpenOrderCompeteResult();
results.add(result);
result.setOrderNo(order.getOrderNo());
result.setOrderTime(order.getOrderTime());
result.setOrderType(order.getDocType$());
- List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
- for (OrderDetl orderDetl : orderDetls) {
- result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getQty()));
+ List<OrderDetlPakout> orderDetlPakouts = orderDetlService.selectByOrderId(order.getId());
+ for (OrderDetlPakout orderDetlPakout : orderDetlPakouts) {
+ result.getOrderDetails().add(new DetlDto(orderDetlPakout.getOrderNo(), orderDetlPakout.getMatnr(), orderDetlPakout.getBatch(), orderDetlPakout.getQty()));
}
if (order.getSettle() == 4L) {
// 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
@@ -166,16 +200,16 @@
}
} else {
// 鎵�鏈夎鍗�
- List<Order> orders = orderService.selectList(new EntityWrapper<Order>().eq("settle", 4L));
- for (Order order : orders) {
+ List<OrderPakin> orders = orderService.selectList(new EntityWrapper<OrderPakin>().eq("settle", 4L));
+ for (OrderPakin order : orders) {
OpenOrderCompeteResult result = new OpenOrderCompeteResult();
results.add(result);
result.setOrderNo(order.getOrderNo());
result.setOrderTime(order.getOrderTime());
result.setOrderType(order.getDocType$());
- List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
- for (OrderDetl orderDetl : orderDetls) {
- result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getQty()));
+ List<OrderDetlPakout> orderDetlPakouts = orderDetlService.selectByOrderId(order.getId());
+ for (OrderDetlPakout orderDetlPakout : orderDetlPakouts) {
+ result.getOrderDetails().add(new DetlDto(orderDetlPakout.getOrderNo(), orderDetlPakout.getMatnr(), orderDetlPakout.getBatch(), orderDetlPakout.getQty()));
}
// 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
if (!orderService.updateSettle(order.getId(), 6L, null)) {
@@ -189,7 +223,8 @@
@Override
@Transactional
public void pakoutOrderCreate(OpenOrderPakoutParam param) {
- Order order = orderService.selectByNo(param.getOrderNo());
+ callApiLogSaveOrder(param, "鍑哄簱鍗�", true);
+ OrderPakin order = orderService.selectByNo(param.getOrderNo());
// 濡傛灉鍗曟嵁涓嶅瓨鍦ㄥ垯娣诲姞锛涘鏋滃崟鎹瓨鍦紝浣滀笟涓棤娉曚慨鏀癸紝鍙嶄箣鍒欎慨鏀瑰崟鎹�
if (!Cools.isEmpty(order)) {
if (order.getSettle() > 1L) {
@@ -197,10 +232,15 @@
}
orderService.remove(order.getId());
}
- DocType docType = docTypeService.selectOrAdd(param.getOrderType(), Boolean.FALSE);
+ DocType docType;
+ if (param.getOrderType().equals("璋冩嫧鍗�")) {
+ docType = docTypeService.selectOrAdd("璋冩嫧鍗�(鍑�)", Boolean.FALSE);
+ } else {
+ docType = docTypeService.selectOrAdd(param.getOrderType(), Boolean.FALSE);
+ }
Date now = new Date();
// 鍗曟嵁涓绘。
- order = new Order(
+ order = new OrderPakin(
String.valueOf(snowflakeIdWorker.nextId()), // 缂栧彿[闈炵┖]
param.getOrderNo(), // 璁㈠崟缂栧彿
param.getInboundDate(), // 鍗曟嵁鏃ユ湡
@@ -236,14 +276,17 @@
now, // 淇敼鏃堕棿
null // 澶囨敞
);
+ order.setShipCode(param.getQuality());
if (!orderService.insert(order)) {
throw new CoolException("鐢熸垚鍗曟嵁涓绘。澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
// 鍗曟嵁鏄庣粏妗�
List<DetlDto> list = new ArrayList<>();
- List<DetlDto> orderDetails = param.getOrderDetails();
+ List<DetlDto> orderDetails = param.getDetails();
for (DetlDto detail : orderDetails) {
- DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getAnfme());
+ DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getAnfme(), param.getFromOrderNo()
+ , detail.getMark(), detail.getCustomer(), detail.getSuppName(), detail.getTemp1(), detail.getTemp2(), detail.getTemp3(), detail.getTemp4());
+ dto.setTemp1(param.getQuality());
if (DetlDto.has(list, dto)) {
DetlDto detlDto = DetlDto.find(list, dto.getMatnr(), dto.getBatch());
assert detlDto != null;
@@ -257,22 +300,29 @@
if (Cools.isEmpty(mat)) {
throw new CoolException(detlDto.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);
- orderDetl.setThreeCode(detlDto.getOrderNo());
- orderDetl.setSuppCode(detlDto.getFromOrderNo());
- orderDetl.setMemo(detlDto.getMemo());
- if (!orderDetlService.insert(orderDetl)) {
+ OrderDetlPakout orderDetlPakout = new OrderDetlPakout();
+ orderDetlPakout.sync(mat);
+ orderDetlPakout.setBatch(detlDto.getBatch());
+ orderDetlPakout.setAnfme(detlDto.getAnfme());
+ orderDetlPakout.setOrderId(order.getId());
+ orderDetlPakout.setOrderNo(order.getOrderNo());
+ orderDetlPakout.setCreateBy(9527L);
+ orderDetlPakout.setCreateTime(now);
+ orderDetlPakout.setUpdateBy(9527L);
+ orderDetlPakout.setUpdateTime(now);
+ orderDetlPakout.setStatus(1);
+ orderDetlPakout.setQty(0.0D);
+ orderDetlPakout.setThreeCode(detlDto.getOrderNo());
+ orderDetlPakout.setSuppCode(detlDto.getFromOrderNo());
+ orderDetlPakout.setMemo(detlDto.getMemo());
+ orderDetlPakout.setManu(detlDto.getMark());
+ orderDetlPakout.setSupp(detlDto.getSuppName());
+ orderDetlPakout.setSku(detlDto.getCustomer());
+ orderDetlPakout.setTemp1(detlDto.getTemp1());
+ orderDetlPakout.setTemp2(detlDto.getTemp2());
+ orderDetlPakout.setTemp3(detlDto.getTemp3());
+ orderDetlPakout.setTemp4(detlDto.getTemp4());
+ if (!orderDetlService.insert(orderDetlPakout)) {
throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
}
@@ -283,16 +333,16 @@
List<OpenOrderCompeteResult> results = new ArrayList<>();
if (!Cools.isEmpty(param) && !Cools.isEmpty(param.getOrderNo())) {
// 鎸囧畾璁㈠崟
- Order order = orderService.selectByNo(param.getOrderNo());
+ OrderPakin order = orderService.selectByNo(param.getOrderNo());
if (null != order) {
OpenOrderCompeteResult result = new OpenOrderCompeteResult();
results.add(result);
result.setOrderNo(order.getOrderNo());
result.setOrderTime(order.getOrderTime());
result.setOrderType(order.getDocType$());
- List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
- for (OrderDetl orderDetl : orderDetls) {
- result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getQty()));
+ List<OrderDetlPakout> orderDetlPakouts = orderDetlService.selectByOrderId(order.getId());
+ for (OrderDetlPakout orderDetlPakout : orderDetlPakouts) {
+ result.getOrderDetails().add(new DetlDto(orderDetlPakout.getOrderNo(), orderDetlPakout.getMatnr(), orderDetlPakout.getBatch(), orderDetlPakout.getQty()));
}
if (order.getSettle() == 4L) {
// 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
@@ -303,16 +353,16 @@
}
} else {
// 鎵�鏈夎鍗�
- List<Order> orders = orderService.selectList(new EntityWrapper<Order>().eq("settle", 4L));
- for (Order order : orders) {
+ List<OrderPakin> orders = orderService.selectList(new EntityWrapper<OrderPakin>().eq("settle", 4L));
+ for (OrderPakin order : orders) {
OpenOrderCompeteResult result = new OpenOrderCompeteResult();
results.add(result);
result.setOrderNo(order.getOrderNo());
result.setOrderTime(order.getOrderTime());
result.setOrderType(order.getDocType$());
- List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
- for (OrderDetl orderDetl : orderDetls) {
- result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getQty()));
+ List<OrderDetlPakout> orderDetlPakouts = orderDetlService.selectByOrderId(order.getId());
+ for (OrderDetlPakout orderDetlPakout : orderDetlPakouts) {
+ result.getOrderDetails().add(new DetlDto(orderDetlPakout.getOrderNo(), orderDetlPakout.getMatnr(), orderDetlPakout.getBatch(), orderDetlPakout.getQty()));
}
// 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
if (!orderService.updateSettle(order.getId(), 6L, null)) {
@@ -329,49 +379,35 @@
return locDetlService.queryStockTotal();
}
+
+
@Override
@Transactional
- public void packageUp(PackParam param) {
- if (Cools.isEmpty(param.getBarcode())) {
- throw new CoolException("barcode涓嶈兘涓虹┖");
- }
- Mat analyse = MatUtils.analyseMat(param.getBarcode());
- Pack pack = packService.selectByBarcode(param.getBarcode());
- if (null != pack) {
- throw new CoolException(param.getBarcode() + "閲嶅鎻愪氦");
- }
- Date now = new Date();
- pack = new Pack(
- param.getBarcode(), // 鏉＄爜[闈炵┖]
- analyse.getMatnr(), // 鍟嗗搧缂栧彿
- analyse.getBarcode(), // 搴忓垪鐮�
- 1L, // 璁㈠崟鐘舵��
- 1, // 鐘舵��
- now, // 娣诲姞鏃堕棿
- null, // 娣诲姞浜哄憳
- now, // 淇敼鏃堕棿
- null, // 淇敼浜哄憳
- null // 澶囨敞
- );
- if (!packService.insert(pack)) {
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ public void syncMat(MatSyncParam param) {
+ if (Cools.isEmpty(param.getMatDetails()) || param.getMatDetails().size() <= 0) {
+ throw new CoolException("鍟嗗搧鏁版嵁涓虹┖");
}
- Mat mat = matService.selectByMatnr(analyse.getMatnr());
- if (mat == null) {
- mat = new Mat();
+
+ for (MatSyncParam.MatParam matParam : param.getMatDetails()) {
+ if (Cools.isEmpty(matParam.getMatnr())) {
+ throw new CoolException("鍟嗗搧缂栫爜涓嶈兘涓虹┖");
+ }
+
+ Date now = new Date();
+ Mat mat = matService.selectByMatnr(matParam.getMatnr());
// 鍒嗙被
Long tagId;
// 涓�绾у垎绫�
- if (!Cools.isEmpty(param.getGroupCode()) && !Cools.isEmpty(param.getGroupName())) {
- Tag priTag = tagService.selectByName(param.getGroupCode(), 2);
+ if (!Cools.isEmpty(matParam.getTagId()) && !Cools.isEmpty(matParam.getGroupName())) {
+ Tag priTag = tagService.selectByName(matParam.getTagId(), 1);
if (priTag == null) {
Tag top = tagService.getTop();
NodeUtils nodeUtils = new NodeUtils();
nodeUtils.executePath(top.getId());
priTag = new Tag(
null, // 缂栧彿
- param.getGroupCode(), // 鍚嶇О
+ matParam.getTagId(), // 鍚嶇О
top.getId(), // 鐖剁骇
top.getName(), // 鐖剁骇鍚嶇О
nodeUtils.path.toString(), // 鍏宠仈璺緞
@@ -395,13 +431,13 @@
}
}
// 浜岀骇鍒嗙被
- Tag secTag = tagService.selectByName(param.getGroupName(), 3);
+ Tag secTag = tagService.selectByName(matParam.getGroupName(), 2);
if (secTag == null) {
NodeUtils nodeUtils = new NodeUtils();
nodeUtils.executePath(priTag.getId());
secTag = new Tag(
null, // 缂栧彿
- param.getGroupName(), // 鍚嶇О
+ matParam.getGroupName(), // 鍚嶇О
priTag.getId(), // 鐖剁骇
priTag.getName(), // 鐖剁骇鍚嶇О
nodeUtils.path.toString(), // 鍏宠仈璺緞
@@ -411,7 +447,7 @@
null, // 鍥剧墖
null, // 绠�瑕佹弿杩�
null, // 鏁伴噺
- 3, // 绛夌骇
+ 2, // 绛夌骇
null, // 鎺掑簭
1, // 鐘舵��
now, // 娣诲姞鏃堕棿
@@ -428,106 +464,9 @@
} else {
tagId = tagService.getTop().getId();
}
- mat.setTagId(tagId);
- mat.setMatnr(analyse.getMatnr());
- mat.setMaktx(param.getMaterialName());
- mat.setSpecs(param.getConfigureDesc());
- mat.setModel(analyse.getModel());
- mat.setStatus(1);
- mat.setCreateTime(now);
- mat.setUpdateTime(now);
- if (!matService.insert(mat)) {
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
- } else {
- log.info("鎵撳寘涓婄嚎娣诲姞鏂扮墿鏂橻鍟嗗搧缂栧彿锛歿}]", mat.getMatnr());
- }
- }
- }
-
- @Override
- @Transactional
- public void syncMat(MatSyncParam param) {
- if (Cools.isEmpty(param.getMatDetails()) || param.getMatDetails().size() <=0 ) {
- throw new CoolException("鍟嗗搧鏁版嵁涓虹┖");
- }
-
- for(MatSyncParam.MatParam matParam : param.getMatDetails()){
- if(Cools.isEmpty(matParam.getMatnr())){
- throw new CoolException("鍟嗗搧缂栫爜涓嶈兘涓虹┖");
- }
-
- Date now = new Date();
- Mat mat = matService.selectByMatnr(matParam.getMatnr());
if (mat == null) {
mat = new Mat();
- // 鍒嗙被
- Long tagId;
- // 涓�绾у垎绫�
- if (!Cools.isEmpty(matParam.getGroupCode()) && !Cools.isEmpty(matParam.getGroupName())) {
- Tag priTag = tagService.selectByName(matParam.getGroupCode(), 1);
- if (priTag == null) {
- Tag top = tagService.getTop();
- NodeUtils nodeUtils = new NodeUtils();
- nodeUtils.executePath(top.getId());
- priTag = new Tag(
- null, // 缂栧彿
- matParam.getGroupCode(), // 鍚嶇О
- top.getId(), // 鐖剁骇
- top.getName(), // 鐖剁骇鍚嶇О
- nodeUtils.path.toString(), // 鍏宠仈璺緞
- nodeUtils.pathName.toString(), // 鍏宠仈璺緞鍚�
- 0, // 绫诲瀷
- null, // 璐熻矗浜�
- null, // 鍥剧墖
- null, // 绠�瑕佹弿杩�
- null, // 鏁伴噺
- 2, // 绛夌骇
- null, // 鎺掑簭
- 1, // 鐘舵��
- now, // 娣诲姞鏃堕棿
- null, // 娣诲姞浜哄憳
- now, // 淇敼鏃堕棿
- null, // 淇敼浜哄憳
- null // 澶囨敞
- );
- if (tagMapper.insert(priTag) == 0) {
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
- }
- }
- // 浜岀骇鍒嗙被
- Tag secTag = tagService.selectByName(matParam.getGroupName(), 3);
- if (secTag == null) {
- NodeUtils nodeUtils = new NodeUtils();
- nodeUtils.executePath(priTag.getId());
- secTag = new Tag(
- null, // 缂栧彿
- matParam.getGroupName(), // 鍚嶇О
- priTag.getId(), // 鐖剁骇
- priTag.getName(), // 鐖剁骇鍚嶇О
- nodeUtils.path.toString(), // 鍏宠仈璺緞
- nodeUtils.pathName.toString(), // 鍏宠仈璺緞鍚�
- 0, // 绫诲瀷
- null, // 璐熻矗浜�
- null, // 鍥剧墖
- null, // 绠�瑕佹弿杩�
- null, // 鏁伴噺
- 3, // 绛夌骇
- null, // 鎺掑簭
- 1, // 鐘舵��
- now, // 娣诲姞鏃堕棿
- null, // 娣诲姞浜哄憳
- now, // 淇敼鏃堕棿
- null, // 淇敼浜哄憳
- null // 澶囨敞
- );
- if (tagMapper.insert(secTag) == 0) {
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
- }
- }
- tagId = secTag.getId();
- } else {
- tagId = tagService.getTop().getId();
- }
+
mat.sync(matParam);
// mat.setMatnr(param.getMatnr());
// mat.setMaktx(param.getMaktx());
@@ -545,10 +484,41 @@
}
} else {
mat.sync(matParam);
- if (!matService.update(mat, new EntityWrapper<Mat>().eq("matnr",matParam.getMatnr()))) {
+ mat.setTagId(tagId);
+ if (!matService.update(mat, new EntityWrapper<Mat>().eq("matnr", matParam.getMatnr()))) {
throw new CoolException("鏇存柊宸插瓨鍦ㄥ晢鍝佷俊鎭け璐ワ紝璇疯仈绯荤鐞嗗憳");
}
}
+
+
+ //Tag tag = tagService.selectOne(new EntityWrapper<Tag>().eq("memo", matParam.getTagId()));
+// if (tag == null) {
+// throw new CoolException("鍑洪敊锛屾湭鎵惧埌鍒嗙被");
+// }
+// if (mat == null) {
+// mat = new Mat();
+// mat.sync(matParam);
+//// mat.setMatnr(param.getMatnr());
+//// mat.setMaktx(param.getMaktx());
+//// mat.setSpecs(param.getSpecs());
+//// mat.setModel(param.getModel());
+//
+// mat.setTagId(tag.getId());
+// mat.setStatus(1);
+// mat.setCreateTime(now);
+// mat.setUpdateTime(now);
+// if (!matService.insert(mat)) {
+// throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+// } else {
+// log.info("鍚屾鏂扮墿鏂橻鍟嗗搧缂栧彿锛歿}]", mat.getMatnr());
+// }
+// } else {
+// mat.sync(matParam);
+// mat.setTagId(tag.getId());
+// if (!matService.update(mat, new EntityWrapper<Mat>().eq("matnr",matParam.getMatnr()))) {
+// throw new CoolException("鏇存柊宸插瓨鍦ㄥ晢鍝佷俊鎭け璐ワ紝璇疯仈绯荤鐞嗗憳");
+// }
+// }
}
}
@@ -557,30 +527,59 @@
@Override
public List<LocDetlByTimeDTO> selectTimeLocDetl(TimeSelectParam param) {
ArrayList<LocDetlByTimeDTO> locDetlByTimeDTOS = new ArrayList<>();
- EntityWrapper<LocDetl> locDetlEntityWrapper = new EntityWrapper<>();
- locDetlEntityWrapper.ge("appe_time",param.getStartTime());
- locDetlEntityWrapper.le("appe_time",param.getEndTime());
- List<LocDetl> locDetls = locDetlService.selectList(locDetlEntityWrapper);
- if (!Cools.isEmpty(locDetls)) {
- for (LocDetl locDetl : locDetls) {
- LocDetlByTimeDTO locDetlByTimeDTO = new LocDetlByTimeDTO();
- if (!Cools.isEmpty(locDetl.getOrderNo())){
- Order order = orderService.selectByNo(locDetl.getOrderNo());
- if (!Cools.isEmpty(order)) {
- locDetlByTimeDTO.setDate(order.getOrderTime());
- locDetlByTimeDTO.setWarehouse(order.getItemName());
- locDetlByTimeDTO.setOrderType(order.getDocType().toString());
+ EntityWrapper<WrkMastLog> wrkMastLogEntityWrapper = new EntityWrapper<>();
+ wrkMastLogEntityWrapper.ge("modi_time", param.getStartTime());
+ wrkMastLogEntityWrapper.le("modi_time", param.getEndTime());
+// wrkMastLogEntityWrapper.isNotNull("sheet_no");
+ wrkMastLogService.selectList(wrkMastLogEntityWrapper).forEach(wrkMastLog -> {
+ if (wrkMastLog.getWrkSts() == 5 || wrkMastLog.getWrkSts() == 15) {
+ List<WrkDetlLog> wrkDetlLogs = wrkDetlLogService.selectList(new EntityWrapper<WrkDetlLog>()
+ .eq("wrk_no", wrkMastLog.getWrkNo()).eq("zpallet", wrkMastLog.getBarcode()));
+ wrkDetlLogs.forEach(wrkDetlLog -> {
+ if (wrkDetlLog.getOrderNo() != null && !wrkDetlLog.getOrderNo().isEmpty()) {
+ LocDetlByTimeDTO locDetlByTimeDTO = new LocDetlByTimeDTO();
+ if (!Cools.isEmpty(wrkDetlLog.getOrderNo())) {
+ OrderPakin order = orderService.selectByNo(wrkDetlLog.getOrderNo());
+ if (!Cools.isEmpty(order)) {
+ locDetlByTimeDTO.setDate(order.getOrderTime());
+ locDetlByTimeDTO.setWarehouse(order.getItemName());
+ locDetlByTimeDTO.setOrderType(order.getDocType$());
+ }
+ locDetlByTimeDTO.setMatnr(wrkDetlLog.getMatnr());
+ locDetlByTimeDTO.setLocNo(wrkMastLog.getIoType() < 100 ? wrkMastLog.getLocNo() : wrkMastLog.getSourceLocNo());
+ locDetlByTimeDTO.setBatch(wrkDetlLog.getBatch());
+ locDetlByTimeDTO.setAnfme(wrkDetlLog.getAnfme());
+ locDetlByTimeDTO.setOrderNo(wrkDetlLog.getOrderNo());
+ locDetlByTimeDTO.setMark(wrkDetlLog.getManu());
+ locDetlByTimeDTO.setWorkNo(wrkDetlLog.getWrkNo().toString());
+ locDetlByTimeDTOS.add(locDetlByTimeDTO);
+ }
}
- }
- locDetlByTimeDTO.setMatnr(locDetl.getMatnr());
- locDetlByTimeDTO.setLocNo(locDetl.getLocNo());
- locDetlByTimeDTO.setBatch(locDetl.getBatch());
- locDetlByTimeDTO.setAnfme(locDetl.getAnfme());
- locDetlByTimeDTO.setOrderNo(locDetl.getOrderNo());
- locDetlByTimeDTOS.add(locDetlByTimeDTO);
+ });
}
- }
+
+ });
+// if (!Cools.isEmpty(locDetls)) {
+// for (LocDetl locDetl : locDetls) {
+//
+// if (!Cools.isEmpty(locDetl.getOrderNo())){
+// Order order = orderService.selectByNo(locDetl.getOrderNo());
+// if (!Cools.isEmpty(order)) {
+// locDetlByTimeDTO.setDate(order.getOrderTime());
+// locDetlByTimeDTO.setWarehouse(order.getItemName());
+// locDetlByTimeDTO.setOrderType(order.getDocType().toString());
+// }
+// }
+//
+// locDetlByTimeDTO.setMatnr(locDetl.getMatnr());
+// locDetlByTimeDTO.setLocNo(locDetl.getLocNo());
+// locDetlByTimeDTO.setBatch(locDetl.getBatch());
+// locDetlByTimeDTO.setAnfme(locDetl.getAnfme());
+// locDetlByTimeDTO.setOrderNo(locDetl.getOrderNo());
+// locDetlByTimeDTOS.add(locDetlByTimeDTO);
+// }
+// }
return locDetlByTimeDTOS;
}
@@ -593,4 +592,151 @@
return true;
}
+ @Override
+ @Transactional
+ public void syncTag(List<TagParam> param) {
+
+ param.forEach(tag -> {
+ // 鍒嗙被
+ Long tagId;
+ Date now = new Date();
+ if (Cools.isEmpty(tag.getParentItemClassId())) {
+ Tag priTag = tagService.selectByName("鍏ㄩ儴", 1);
+
+ // 浜岀骇鍒嗙被
+ Tag secTag = tagService.selectByName(tag.getName(), 2);
+ if (secTag == null) {
+ NodeUtils nodeUtils = new NodeUtils();
+ nodeUtils.executePath(priTag.getId());
+ secTag = new Tag(
+ null, // 缂栧彿
+ tag.getName(), // 鍚嶇О
+ priTag.getId(), // 鐖剁骇
+ priTag.getName(), // 鐖剁骇鍚嶇О
+ nodeUtils.path.toString(), // 鍏宠仈璺緞
+ nodeUtils.pathName.toString(), // 鍏宠仈璺緞鍚�
+ 0, // 绫诲瀷
+ null, // 璐熻矗浜�
+ null, // 鍥剧墖
+ null, // 绠�瑕佹弿杩�
+ null, // 鏁伴噺
+ 2, // 绛夌骇
+ null, // 鎺掑簭
+ 1, // 鐘舵��
+ now, // 娣诲姞鏃堕棿
+ null, // 娣诲姞浜哄憳
+ now, // 淇敼鏃堕棿
+ null, // 淇敼浜哄憳
+ tag.getItemClassId() // 澶囨敞
+ );
+ if (tagMapper.insert(secTag) == 0) {
+ throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ }
+ }
+ } else {
+ Tag priTag = tagService.selectOne(new EntityWrapper<Tag>().eq("memo", tag.getParentItemClassId()));
+ if (priTag == null) {
+ Tag top = tagService.getTop();
+ NodeUtils nodeUtils = new NodeUtils();
+ nodeUtils.executePath(top.getId());
+ priTag = new Tag(
+ null, // 缂栧彿
+ tag.getParentName(), // 鍚嶇О
+ top.getId(), // 鐖剁骇
+ top.getName(), // 鐖剁骇鍚嶇О
+ nodeUtils.path.toString(), // 鍏宠仈璺緞
+ nodeUtils.pathName.toString(), // 鍏宠仈璺緞鍚�
+ 0, // 绫诲瀷
+ null, // 璐熻矗浜�
+ null, // 鍥剧墖
+ null, // 绠�瑕佹弿杩�
+ null, // 鏁伴噺
+ 2, // 绛夌骇
+ null, // 鎺掑簭
+ 1, // 鐘舵��
+ now, // 娣诲姞鏃堕棿
+ null, // 娣诲姞浜哄憳
+ now, // 淇敼鏃堕棿
+ null, // 淇敼浜哄憳
+ tag.getParentItemClassId() // 澶囨敞
+ );
+ if (tagMapper.insert(priTag) == 0) {
+ throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ }
+ }
+
+ // 浜岀骇鍒嗙被
+ Tag secTag = tagService.selectOne(new EntityWrapper<Tag>().eq("memo", tag.getItemClassId()));
+ NodeUtils nodeUtils = new NodeUtils();
+ nodeUtils.executePath(priTag.getId());
+ if (secTag == null) {
+ secTag = new Tag(
+ null, // 缂栧彿
+ tag.getName(), // 鍚嶇О
+ priTag.getId(), // 鐖剁骇
+ priTag.getName(), // 鐖剁骇鍚嶇О
+ nodeUtils.path.toString(), // 鍏宠仈璺緞
+ nodeUtils.pathName.toString(), // 鍏宠仈璺緞鍚�
+ 0, // 绫诲瀷
+ null, // 璐熻矗浜�
+ null, // 鍥剧墖
+ null, // 绠�瑕佹弿杩�
+ null, // 鏁伴噺
+ 2, // 绛夌骇
+ null, // 鎺掑簭
+ 1, // 鐘舵��
+ now, // 娣诲姞鏃堕棿
+ null, // 娣诲姞浜哄憳
+ now, // 淇敼鏃堕棿
+ null, // 淇敼浜哄憳
+ tag.getItemClassId() // 澶囨敞
+ );
+ if (tagMapper.insert(secTag) == 0) {
+ throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ }
+ } else {
+ secTag.setName(tag.getName());
+ secTag.setParentId(priTag.getId());
+ secTag.setParentName(priTag.getName());
+ secTag.setPath(nodeUtils.path.toString());
+ secTag.setPathName(nodeUtils.pathName.toString());
+ if (tagMapper.updateById(secTag) == 0) {
+ throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ }
+
+ List<Tag> tags = tagService.selectList(new EntityWrapper<Tag>().eq("parent_id", secTag.getId()));
+ if (!Cools.isEmpty(tags)) {
+ for (Tag tag1 : tags) {
+ tag1.setPath(nodeUtils.path.toString() + "," + secTag.getId());
+ tag1.setPathName(nodeUtils.pathName.toString() + "," + secTag.getName());
+ if (tagMapper.updateById(tag1) == 0) {
+ throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ }
+ }
+ }
+
+
+ }
+
+
+ }
+ });
+ }
+
+ @Transactional
+ @Override
+ public void orderDelete(String orderNo) {
+ OrderPakin order = orderService.selectByNo(orderNo);
+ if (order == null) {
+ throw new CoolException("鏈煡璇㈠埌瀵瑰簲璁㈠崟淇℃伅");
+ }
+ if (order.getSettle() != 1) {
+ throw new CoolException("璇ヨ鍗曞凡鏈夊搴斾换鍔★紝绂佹鍒犻櫎");
+ }
+ List<OrderDetlPakout> OrderDetlPakout = orderDetlService.selectList(new EntityWrapper<OrderDetlPakout>().eq("order_no", orderNo));
+ if (!Cools.isEmpty(OrderDetlPakout)) {
+ orderDetlService.delete(new EntityWrapper<OrderDetlPakout>().eq("order_no", orderNo));
+ }
+ orderService.delete(new EntityWrapper<OrderPakin>().eq("order_no", orderNo));
+ }
}
--
Gitblit v1.9.1