From 21d0e7ab9d5c7316225a3e9eecf465cd37c9bd85 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 05 六月 2025 14:15:07 +0800
Subject: [PATCH] 123
---
src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java | 52 ++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 48 insertions(+), 4 deletions(-)
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 5dfcafa..c9d2f09 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
@@ -1,5 +1,8 @@
package com.zy.asrs.service.impl;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.core.common.Cools;
@@ -15,6 +18,7 @@
import com.zy.common.model.DetlDto;
import com.zy.common.model.OrderDto;
import com.zy.common.model.OrderMergeVo;
+import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -38,6 +42,8 @@
private DocTypeService docTypeService;
@Autowired
private WrkDetlService wrkDetlService;
+ @Autowired
+ private MatService matService;
@Override
public Order selectByNo(String orderNo) {
@@ -54,6 +60,11 @@
}
@Override
+ public List<OrderDetl> selectTotalDetls(Long orderId) {
+ return orderDetlMapper.selectTotalDetls(orderId);
+ }
+
+ @Override
public boolean updateSettle(Long orderId, Long settle, Long userId) {
return this.baseMapper.updateSettle(orderId, settle, userId) > 0;
}
@@ -61,7 +72,7 @@
@Override
public void checkComplete(String orderNo) {
Order order = this.selectByNo(orderNo);
- if (order.getSettle() >= 4L) {
+ if (order==null || order.getSettle() >= 4L) {
return;
}
List<OrderDetl> orderDetls = orderDetlMapper.selectList(new EntityWrapper<OrderDetl>().eq("order_id", order.getId()));
@@ -72,20 +83,34 @@
break;
}
}
- if (complete && wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("order_no", orderNo)) == 0) {
+ if (complete && wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().like("order_no", orderNo)) == 0) {
// 鍑哄簱璁㈠崟閲嶆柊鏁寸悊鏄庣粏
DocType docType = docTypeService.selectById(order.getDocType());
if (null != docType && docType.getPakout() == 1) {
+ // 閲嶇粍鏄庣粏
if (!orderDetlService.delete(new EntityWrapper<OrderDetl>().eq("order_id", order.getId()))) {
- throw new CoolException("閲嶆暣鍑哄簱璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戞槑缁嗗け璐�");
+ throw new CoolException("閲嶇粍鍑哄簱璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戞槑缁嗗け璐�");
}
List<WrkDetl> wrkDetls = wrkDetlService.selectAndLogByOrderNo(orderNo);
for (WrkDetl wrkDetl : wrkDetls) {
OrderDetl orderDetl = new OrderDetl();
orderDetl.sync(wrkDetl);
- orderDetl.setQty(orderDetl.getAnfme());
orderDetl.setOrderId(order.getId());
orderDetl.setOrderNo(orderNo);
+ if (!BaseController.isJSON(wrkDetl.getOrderNo())) {
+ orderDetl.setQty(orderDetl.getAnfme());
+ } else {
+ // 璁㈠崟鍚堝苟鍑哄簱
+ List<OrderDto> orderDtoList = JSON.parseArray(wrkDetl.getOrderNo(), OrderDto.class);
+
+ for (OrderDto one : orderDtoList) {
+ if (one.getOrderNo().equals(orderNo)) {
+ orderDetl.setAnfme(one.getAnfme());
+ orderDetl.setQty(one.getAnfme());
+ break;
+ }
+ }
+ }
orderDetl.setStatus(1);
orderDetl.setCreateTime(order.getCreateTime());
orderDetl.setCreateBy(order.getCreateBy());
@@ -190,7 +215,26 @@
}
}
+ for (OrderMergeVo vo : result) {
+ Mat mat = matService.selectByMatnr(vo.getMatnr());
+ assert mat != null;
+ vo.setMaktx(mat.getMaktx());
+ vo.setSpecs(mat.getSpecs());
+ }
return result;
}
+ /**
+ * 鏌ヨ涓婃姤瀹岀粨鍘嗗彶妗�
+ * @return
+ */
+ @Override
+ public List<Order> selectToBeHistoryOrder() {
+ return this.baseMapper.selectToBeHistoryOrder();
+ }
+
+ @Override
+ public List<Order> selectOrderNoL(String orderNo) {
+ return this.baseMapper.selectOrderNoL(orderNo);
+ }
}
--
Gitblit v1.9.1