From 9385556bb5e1b55977b230f1884ae127d5ab579b Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 24 十二月 2024 14:31:22 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/OrderMapper.xml | 9 +++
src/main/java/com/zy/asrs/service/OrderService.java | 1
src/main/java/com/zy/asrs/entity/OrderDetl.java | 16 +++++
src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java | 5 +
src/main/java/com/zy/asrs/mapper/OrderMapper.java | 1
src/main/java/com/zy/asrs/task/OrderSyncScheduler.java | 41 ++++++++++++-
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 82 ++++++++++++++++++++++++---
src/main/java/com/zy/common/model/DetlDto.java | 12 ++++
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 6 +
9 files changed, 157 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetl.java b/src/main/java/com/zy/asrs/entity/OrderDetl.java
index e17cb96..327aaa3 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetl.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetl.java
@@ -7,6 +7,7 @@
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.asrs.service.OrderService;
+import com.zy.common.model.DetlDto;
import com.zy.common.utils.Synchro;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
@@ -17,6 +18,7 @@
import java.io.Serializable;
import java.text.SimpleDateFormat;
import java.util.Date;
+import java.util.List;
@Data
@TableName("man_order_detl")
@@ -552,6 +554,20 @@
);
}
+ public static OrderDetl find(List<OrderDetl> detlDtos, String matnr, String batch, String brand, String standby1, String standby2, String standby3) {
+ if (Cools.isEmpty(matnr)) {
+ return null;
+ }
+ for (OrderDetl detlDto : detlDtos) {
+ if (matnr.equals(detlDto.getMatnr()) && Cools.eq(batch, detlDto.getBatch())
+ && brand.equals(detlDto.getBrand()) && standby1.equals(detlDto.getStandby1())
+ && standby2.equals(detlDto.getStandby2()) && standby3.equals(detlDto.getStandby3())) {
+ return detlDto;
+ }
+ }
+ return null;
+ }
+
public String getPakinPakoutStatus$(){
if (Cools.isEmpty(this.pakinPakoutStatus)) return null;
switch (this.pakinPakoutStatus){
diff --git a/src/main/java/com/zy/asrs/mapper/OrderMapper.java b/src/main/java/com/zy/asrs/mapper/OrderMapper.java
index 5500ade..ae0223b 100644
--- a/src/main/java/com/zy/asrs/mapper/OrderMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/OrderMapper.java
@@ -15,6 +15,7 @@
int updateSettle(@Param("orderId")Long orderId, @Param("settle")Long settle, @Param("userId")Long userId);
List<Order> selectComplete();
+ List<Order> selectComplete1();
List<Order> selectComplete8();
int addToLogTable(Order order);
diff --git a/src/main/java/com/zy/asrs/service/OrderService.java b/src/main/java/com/zy/asrs/service/OrderService.java
index 08619c8..1d3d2c6 100644
--- a/src/main/java/com/zy/asrs/service/OrderService.java
+++ b/src/main/java/com/zy/asrs/service/OrderService.java
@@ -25,6 +25,7 @@
void remove(Long orderId);
List<Order> selectComplete();
+ List<Order> selectComplete1();
List<Order> selectComplete8();
boolean addToLogTable(Order order);
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 9fd8dff..53ae235 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -96,6 +96,7 @@
now, // 淇敼鏃堕棿
null // 澶囨敞
);
+ order.setPakinPakoutStatus(1);
if (!orderService.insert(order)) {
throw new CoolException("鐢熸垚鍗曟嵁涓绘。澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
@@ -104,7 +105,7 @@
List<DetlDto> orderDetails = param.getOrderDetails();
for (DetlDto detail : orderDetails) {
DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(),detail.getBrand(),detail.getStandby1(),detail.getStandby2(),detail.getStandby3(),detail.getLineNumber(), detail.getAnfme());
- if (DetlDto.has(list, dto)) {
+ if (DetlDto.hasLineNumber(list, dto)) {
DetlDto detlDto = DetlDto.findLineNumber(list, dto.getMatnr(), dto.getBatch(),dto.getBrand(),dto.getStandby1(),dto.getStandby2(),dto.getStandby3(),dto.getLineNumber());
assert detlDto != null;
detlDto.setAnfme(detlDto.getAnfme() + detail.getAnfme());
@@ -249,6 +250,7 @@
now, // 淇敼鏃堕棿
null // 澶囨敞
);
+ order.setPakinPakoutStatus(2);
if (!orderService.insert(order)) {
throw new CoolException("鐢熸垚鍗曟嵁涓绘。澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
@@ -257,7 +259,7 @@
List<DetlDto> orderDetails = param.getOrderDetails();
for (DetlDto detail : orderDetails) {
DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(),detail.getBrand(),detail.getStandby1(),detail.getStandby2(),detail.getStandby3(),detail.getLineNumber(), detail.getAnfme());
- if (DetlDto.has(list, dto)) {
+ if (DetlDto.hasLineNumber(list, dto)) {
DetlDto detlDto = DetlDto.findLineNumber(list, dto.getMatnr(), dto.getBatch(),dto.getBrand(),dto.getStandby1(),dto.getStandby2(),dto.getStandby3(),dto.getLineNumber());
assert detlDto != null;
detlDto.setAnfme(detlDto.getAnfme() + detail.getAnfme());
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
index 2ec0b86..b5c5d5f 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
@@ -175,6 +175,11 @@
}
@Override
+ public List<Order> selectComplete1() {
+ return this.baseMapper.selectComplete1();
+ }
+
+ @Override
public List<Order> selectComplete8() {
return this.baseMapper.selectComplete8();
}
diff --git a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
index 90ced31..fc2ccf3 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -41,13 +41,39 @@
@Scheduled(cron = "0/5 * * * * ? ")
@Async("orderThreadPool")
+ public void completeAndReportOrderIssued() {
+ String erpReport = Parameter.get().getErpReport();
+ if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
+ List<Order> orderList = orderService.selectComplete1();
+// List<Order> orderList = orderService.selectList(new EntityWrapper<Order>().eq("settle", 1L).eq("status", 1).orderBy("create_time", true));
+ for (Order order : orderList) {
+ try {
+ ReturnT<String> result = orderSyncHandler.startOrderIssued(order);
+ if (!result.isSuccess()) {
+ log.error("鍗曟嵁[orderNo={}]涓婃姤erp澶辫触", order.getOrderNo());
+ }
+ } catch (Exception e){
+ log.error(e.getMessage());
+ log.error("鍗曟嵁[orderNo={}]涓婃姤erp澶辫触", order.getOrderNo());
+ }
+ }
+ }
+ }
+
+ @Scheduled(cron = "0/5 * * * * ? ")
+ @Async("orderThreadPool")
public void completeAndReportOrderInAndOutUtil() {
String erpReport = Parameter.get().getErpReport();
if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
List<Order> orders = OrderInAndOutUtil.selectComplete(null);
for (Order order : orders) {
- ReturnT<String> result = orderSyncHandler.startOrderInAndOutUtil(order);
- if (!result.isSuccess()) {
+ try {
+ ReturnT<String> result = orderSyncHandler.startOrderInAndOutUtil(order);
+ if (!result.isSuccess()) {
+ log.error("鍗曟嵁[orderNo={}]杞笂鎶ヨ〃澶辫触", order.getOrderNo());
+ }
+ } catch (Exception e){
+ log.error(e.getMessage());
log.error("鍗曟嵁[orderNo={}]杞笂鎶ヨ〃澶辫触", order.getOrderNo());
}
}
@@ -56,13 +82,18 @@
@Scheduled(cron = "0/5 * * * * ? ")
@Async("orderThreadPool")
- public void completeAndReportOrder() {
+ public void completeAndReportOrderReport() {
String erpReport = Parameter.get().getErpReport();
if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
List<Order> orders = orderService.selectComplete();
for (Order order : orders) {
- ReturnT<String> result = orderSyncHandler.startOrder(order);
- if (!result.isSuccess()) {
+ try {
+ ReturnT<String> result = orderSyncHandler.startOrderReport(order);
+ if (!result.isSuccess()) {
+ log.error("鍗曟嵁[orderNo={}]涓婃姤erp澶辫触", order.getOrderNo());
+ }
+ } catch (Exception e) {
+ log.error(e.getMessage());
log.error("鍗曟嵁[orderNo={}]涓婃姤erp澶辫触", order.getOrderNo());
}
}
diff --git a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
index fb44ebd..1fab658 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -16,6 +16,7 @@
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.utils.OrderInAndOutUtil;
import com.zy.common.constant.MesConstant;
+import com.zy.common.model.DetlDto;
import com.zy.common.model.MesPakinParam;
import com.zy.common.model.MesPakoutParam;
import com.zy.common.utils.HttpHandler;
@@ -25,6 +26,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -45,25 +47,87 @@
@Autowired
private DocTypeService docTypeService;
@Transactional
+ public ReturnT<String> startOrderIssued(Order order) {
+ DocType docType = docTypeService.selectById(order.getDocType());
+ if (null == docType) {
+ return SUCCESS;
+ }
+ List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
+
+ OrderInAndOutUtil.insertOrder(order.getPakinPakoutStatus$(),order);
+ // 鍗曟嵁鏄庣粏妗�
+ List<DetlDto> list = new ArrayList<>();
+ List<OrderDetl> orderDetlList = new ArrayList<>();
+
+ for (OrderDetl detail : orderDetls) {
+ DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(),detail.getBrand(),detail.getStandby1(),detail.getStandby2(),detail.getStandby3(), detail.getAnfme());
+ if (DetlDto.has(list, dto)) {
+ DetlDto detlDto = DetlDto.find(list, dto.getMatnr(), dto.getBatch(),dto.getBrand(),dto.getStandby1(),dto.getStandby2(),dto.getStandby3());
+ assert detlDto != null;
+ detlDto.setAnfme(detlDto.getAnfme() + detail.getAnfme());
+
+ OrderDetl orderDetl = OrderDetl.find(orderDetlList, dto.getMatnr(), dto.getBatch(),dto.getBrand(),dto.getStandby1(),dto.getStandby2(),dto.getStandby3());
+ assert orderDetl != null;
+ orderDetl.setAnfme(orderDetl.getAnfme() + detail.getAnfme());
+ } else {
+ list.add(dto);
+ orderDetlList.add(detail);
+ }
+ }
+ for (OrderDetl orderDetl : orderDetlList){
+ OrderInAndOutUtil.insertOrderDetl(order.getPakinPakoutStatus$(),order,orderDetl);
+ }
+ // 淇敼璁㈠崟鐘舵�� 1.鏈綔涓� ===>> 2.浣滀笟涓�
+ if (!orderService.updateSettle(order.getId(), 2L, null)) {
+ throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ }
+ return SUCCESS;
+ }
+ @Transactional
public ReturnT<String> startOrderInAndOutUtil(Order order) {
DocType docType = docTypeService.selectById(order.getDocType());
if (null == docType) {
return SUCCESS;
}
- List<OrderDetl> orderDetls = OrderInAndOutUtil.selectByOrderId(order.getPakinPakoutStatus$(), order.getId());
- Order orderNew = new Order(order);
- orderService.insert(orderNew);
- for (OrderDetl orderDetl : orderDetls){
- OrderDetl orderDetlNew = new OrderDetl(orderDetl);
- orderDetlNew.setOrderId(orderNew.getId());
- orderDetlService.insert(orderDetlNew);
+ Order orderSou = orderService.selectByNo(order.getOrderNo());
+ if (!orderSou.getSettle().equals(2L)){
+ return FAIL.setMsg("璁㈠崟鐘舵�佷笉姝ｇ‘锛岃鑱旂郴绠＄悊鍛�");
}
- // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
+ List<OrderDetl> orderDetlList = orderDetlService.selectByOrderId(orderSou.getId());
+
+ List<OrderDetl> orderDetls = OrderInAndOutUtil.selectByOrderId(order.getPakinPakoutStatus$(), order.getId());
+
+ for (OrderDetl orderDetlSou : orderDetlList){
+ for (OrderDetl orderDetl : orderDetls){
+ if (orderDetl.getQty().equals(0D)){
+ continue;
+ }
+ if (orderDetlSou.beSimilar(orderDetl)){
+ double v = orderDetlSou.getAnfme() - orderDetlSou.getQty();
+ if (v<orderDetl.getQty() || orderDetl.getQty().equals(v)){
+ orderDetlSou.setQty(orderDetlSou.getAnfme());
+ orderDetl.setQty(orderDetl.getQty() - v);
+ break;
+ } else {
+ orderDetlSou.setQty(orderDetlSou.getQty()+orderDetl.getQty());
+ orderDetl.setQty(0D);
+ }
+ }
+ }
+ }
+ for (OrderDetl orderDetlSou : orderDetlList){
+ orderDetlService.updateById(orderDetlSou);
+ }
+ // 淇敼璁㈠崟鐘舵�� 2.浣滀笟涓� ===>> 4.寰呬笂鎶�
+ if (!orderService.updateSettle(orderSou.getId(), 4L, null)) {
+ throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ }
+ // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.缁撴潫
OrderInAndOutUtil.updateOrder(order.getPakinPakoutStatus$(),order.getId(),6L,null);
return SUCCESS;
}
@Transactional
- public ReturnT<String> startOrder(Order order) {
+ public ReturnT<String> startOrderReport(Order order) {
DocType docType = docTypeService.selectById(order.getDocType());
if (null == docType) {
return SUCCESS;
diff --git a/src/main/java/com/zy/common/model/DetlDto.java b/src/main/java/com/zy/common/model/DetlDto.java
index 580927b..eb5e7d1 100644
--- a/src/main/java/com/zy/common/model/DetlDto.java
+++ b/src/main/java/com/zy/common/model/DetlDto.java
@@ -174,6 +174,18 @@
return false;
}
+ public static boolean hasLineNumber(List<DetlDto> detlDtos, DetlDto detlDto) {
+ for (DetlDto dto : detlDtos) {
+ if (dto.getMatnr().equals(detlDto.getMatnr()) && Cools.eq(dto.getBatch(), detlDto.getBatch())
+ && Cools.eq(dto.getBrand(), detlDto.getBrand()) && Cools.eq(dto.getStandby1(), detlDto.getStandby1())
+ && Cools.eq(dto.getStandby2(), detlDto.getStandby2()) && Cools.eq(dto.getStandby3(), detlDto.getStandby3())
+ && dto.getLineNumber().equals(detlDto.getLineNumber())) {
+ return true;
+ }
+ }
+ return false;
+ }
+
public static DetlDto find(List<DetlDto> detlDtos, String matnr, String batch, String brand, String standby1, String standby2, String standby3) {
if (Cools.isEmpty(matnr)) {
return null;
diff --git a/src/main/resources/mapper/OrderMapper.xml b/src/main/resources/mapper/OrderMapper.xml
index c2c298b..0e7e9a8 100644
--- a/src/main/resources/mapper/OrderMapper.xml
+++ b/src/main/resources/mapper/OrderMapper.xml
@@ -64,6 +64,15 @@
order by create_time asc
</select>
+ <select id="selectComplete1" resultMap="BaseResultMap">
+ select top 5 *
+ from man_order
+ where 1=1
+ and settle = 1
+ and status = 1
+ order by create_time asc
+ </select>
+
<select id="selectComplete8" resultMap="BaseResultMap">
select top 5 *
from man_order
--
Gitblit v1.9.1