diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java index f9b89b2..950c28d 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java @@ -230,6 +230,7 @@ public class OrderServiceImpl implements OrderService { return orderDao.findAllByTime(orderFilterRequest); } + //平衡补单 @Override public BaseResponse supplementOrder(String billNo, String orderIdFk) { //查询订单数据 @@ -267,6 +268,7 @@ public class OrderServiceImpl implements OrderService { supplementOrder.setCorpOrderId(CustomUtil.getId() + "x"); //修改往来单位及当前库存号 supplementOrder.setFromCorpId(order.getLocStorageCode()); + supplementOrder.setFromSubInvCode(order.getInvWarehouseCode()); supplementOrder.setLocStorageCode(order.getFromCorpId()); supplementOrder.setInvWarehouseCode(null); String name = invWarehouseDao.getNameByCode(supplementOrder.getFromCorpId()); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/AsyncDiDlHelper.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/AsyncDiDlHelper.java index 9772bf4..660a862 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/thread/AsyncDiDlHelper.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/thread/AsyncDiDlHelper.java @@ -1,19 +1,25 @@ package com.glxp.sale.admin.thread; +import cn.hutool.core.collection.CollUtil; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; import com.glxp.sale.admin.entity.basic.UdiCompanyEntity; import com.glxp.sale.admin.entity.receipt.ProductInfoEntity; +import com.glxp.sale.admin.service.receipt.ProductInfoService; import com.glxp.sale.admin.util.HttpClient; import com.glxp.sale.common.res.BaseResponse; import com.glxp.sale.common.util.ResultVOUtils; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; +import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.util.HashMap; import java.util.List; import java.util.Map; +@Slf4j @Service public class AsyncDiDlHelper { @Value("${UDI_SERVER_URL}") @@ -115,4 +121,33 @@ public class AsyncDiDlHelper { } } + + @Resource + ProductInfoService productInfoService; + + @Async + public void dlByUuid(String uuid) { + + + Map paramMap = new HashMap<>(16); + paramMap.put("uuid", uuid); + String response = HttpClient.mipsGet(udiUrl + "/udidl/device/searchDlByUuid", paramMap); + try { + BaseResponse> baseResponse = + JSONObject.parseObject(response, new TypeReference>>() { + }); + if (baseResponse != null && baseResponse.getCode() == 20000) { + List productInfoEntityList = baseResponse.getData(); + if (CollUtil.isNotEmpty(productInfoEntityList)) { + productInfoService.insertProductInfos(productInfoEntityList); + } + + } else { + log.error("下载出错"); + } + } catch (Exception e) { + e.printStackTrace(); + } + + } } diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml b/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml index 14ded8d..63be393 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml @@ -310,7 +310,7 @@ inv_warehouse_sub.name as subInvName FROM io_order LEFT JOIN inv_warehouse ON io_order.locStorageCode = inv_warehouse.`code` - LEFT JOIN inv_warehouse_sub ON inv_warehouse_sub.parentId = inv_warehouse.`code` + LEFT JOIN inv_warehouse_sub ON inv_warehouse_sub.code = io_order.invWarehouseCode LEFT JOIN inv_warehouse_user on inv_warehouse_sub.code = inv_warehouse_user.`code`