From 59183282a7cfdb6bd0976697681c851baf696265 Mon Sep 17 00:00:00 2001
From: Administrator <56479841@QQ.COM>
Date: 星期五, 30 六月 2023 12:35:20 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 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 319c1a0..8c7a776 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
@@ -1,6 +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;
@@ -90,11 +92,12 @@
orderDetl.sync(wrkDetl);
orderDetl.setOrderId(order.getId());
orderDetl.setOrderNo(orderNo);
- if (BaseController.isJSON(wrkDetl.getOrderNo())) {
+ 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());
@@ -216,4 +219,12 @@
return result;
}
+ /**
+ * 鏌ヨ涓婃姤瀹岀粨鍘嗗彶妗�
+ * @return
+ */
+ @Override
+ public List<Order> selectToBeHistoryOrder() {
+ return this.baseMapper.selectToBeHistoryOrder();
+ }
}
--
Gitblit v1.9.1