#

LSH

2023-02-14 c46f9c28f8d40d2a4efcc7ef6e528661d97a4be0

 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());