From 3989e356b6b8bcd31e2d2981ac78e41f8ebbdfa5 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期三, 19 十月 2022 10:02:31 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 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 c50a9df..319c1a0 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,6 @@
package com.zy.asrs.service.impl;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.core.common.Cools;
@@ -15,6 +16,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;
@@ -80,15 +82,27 @@
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());
--
Gitblit v1.9.1