|
|
@ -7,16 +7,15 @@ import com.glxp.api.admin.constant.Constant;
|
|
|
|
import com.glxp.api.admin.constant.ConstantStatus;
|
|
|
|
import com.glxp.api.admin.constant.ConstantStatus;
|
|
|
|
import com.glxp.api.admin.constant.ConstantType;
|
|
|
|
import com.glxp.api.admin.constant.ConstantType;
|
|
|
|
import com.glxp.api.admin.controller.inout.utils.CheckOrderUtils;
|
|
|
|
import com.glxp.api.admin.controller.inout.utils.CheckOrderUtils;
|
|
|
|
import com.glxp.api.admin.controller.inout.utils.ContrastErpUtil;
|
|
|
|
|
|
|
|
import com.glxp.api.admin.controller.inout.utils.DataTransUtil;
|
|
|
|
|
|
|
|
import com.glxp.api.admin.controller.inout.utils.InoutUtils;
|
|
|
|
import com.glxp.api.admin.controller.inout.utils.InoutUtils;
|
|
|
|
import com.glxp.api.admin.dao.business.StockOrderRemakDao;
|
|
|
|
import com.glxp.api.admin.dao.business.StockOrderRemakDao;
|
|
|
|
import com.glxp.api.admin.entity.basic.*;
|
|
|
|
import com.glxp.api.admin.entity.basic.BasicUnitMaintainEntity;
|
|
|
|
|
|
|
|
import com.glxp.api.admin.entity.basic.BussinessTypeEntity;
|
|
|
|
|
|
|
|
import com.glxp.api.admin.entity.basic.CompanyProductRelevanceEntity;
|
|
|
|
|
|
|
|
import com.glxp.api.admin.entity.basic.UdiEntity;
|
|
|
|
import com.glxp.api.admin.entity.business.StockOrderDetailEntity;
|
|
|
|
import com.glxp.api.admin.entity.business.StockOrderDetailEntity;
|
|
|
|
import com.glxp.api.admin.entity.business.StockOrderEntity;
|
|
|
|
import com.glxp.api.admin.entity.business.StockOrderEntity;
|
|
|
|
import com.glxp.api.admin.entity.business.StockOrderRemakEntity;
|
|
|
|
import com.glxp.api.admin.entity.business.StockOrderRemakEntity;
|
|
|
|
import com.glxp.api.admin.entity.info.CompanyEntity;
|
|
|
|
|
|
|
|
import com.glxp.api.admin.entity.info.SystemParamConfigEntity;
|
|
|
|
|
|
|
|
import com.glxp.api.admin.entity.inout.ErpOrderEntity;
|
|
|
|
import com.glxp.api.admin.entity.inout.ErpOrderEntity;
|
|
|
|
import com.glxp.api.admin.entity.inout.FilterErpOrderRequest;
|
|
|
|
import com.glxp.api.admin.entity.inout.FilterErpOrderRequest;
|
|
|
|
import com.glxp.api.admin.entity.inout.OrderEntity;
|
|
|
|
import com.glxp.api.admin.entity.inout.OrderEntity;
|
|
|
@ -24,41 +23,33 @@ import com.glxp.api.admin.entity.inout.WarehouseEntity;
|
|
|
|
import com.glxp.api.admin.entity.inventory.InvProductDetailEntity;
|
|
|
|
import com.glxp.api.admin.entity.inventory.InvProductDetailEntity;
|
|
|
|
import com.glxp.api.admin.entity.inventory.InvProductEntity;
|
|
|
|
import com.glxp.api.admin.entity.inventory.InvProductEntity;
|
|
|
|
import com.glxp.api.admin.entity.inventory.InvWarehouseEntity;
|
|
|
|
import com.glxp.api.admin.entity.inventory.InvWarehouseEntity;
|
|
|
|
import com.glxp.api.admin.httpclient.ErpOrderClient;
|
|
|
|
|
|
|
|
import com.glxp.api.admin.httpclient.UdiDlHttpClient;
|
|
|
|
|
|
|
|
import com.glxp.api.admin.req.basic.CompanyProductRelevanceRequest;
|
|
|
|
import com.glxp.api.admin.req.basic.CompanyProductRelevanceRequest;
|
|
|
|
import com.glxp.api.admin.req.basic.FilterCompanyProductRelevanceRequest;
|
|
|
|
import com.glxp.api.admin.req.basic.FilterCompanyProductRelevanceRequest;
|
|
|
|
import com.glxp.api.admin.req.basic.FilterUdiInfoRequest;
|
|
|
|
|
|
|
|
import com.glxp.api.admin.req.business.StockOrderFilterRequest;
|
|
|
|
import com.glxp.api.admin.req.business.StockOrderFilterRequest;
|
|
|
|
import com.glxp.api.admin.req.inout.CommitRequest;
|
|
|
|
import com.glxp.api.admin.req.inout.CommitRequest;
|
|
|
|
import com.glxp.api.admin.req.inout.OrderFilterRequest;
|
|
|
|
import com.glxp.api.admin.req.inout.OrderFilterRequest;
|
|
|
|
import com.glxp.api.admin.req.inout.PostOrderRequest;
|
|
|
|
import com.glxp.api.admin.req.inout.PostOrderRequest;
|
|
|
|
import com.glxp.api.admin.req.inout.WarehouseQueryRequest;
|
|
|
|
import com.glxp.api.admin.req.inout.WarehouseQueryRequest;
|
|
|
|
import com.glxp.api.admin.req.inventory.FilterInvProductDetailRequest;
|
|
|
|
|
|
|
|
import com.glxp.api.admin.req.inventory.FilterInvProductRequest;
|
|
|
|
import com.glxp.api.admin.req.inventory.FilterInvProductRequest;
|
|
|
|
import com.glxp.api.admin.req.inventory.FilterInvWarehouseRequest;
|
|
|
|
import com.glxp.api.admin.req.inventory.FilterInvWarehouseRequest;
|
|
|
|
import com.glxp.api.admin.res.basic.BussinessOriginTypeResponse;
|
|
|
|
|
|
|
|
import com.glxp.api.admin.res.basic.UdiRelevanceResponse;
|
|
|
|
import com.glxp.api.admin.res.basic.UdiRelevanceResponse;
|
|
|
|
import com.glxp.api.admin.res.info.CompanyProductRelevanceResponse;
|
|
|
|
import com.glxp.api.admin.res.info.CompanyProductRelevanceResponse;
|
|
|
|
import com.glxp.api.admin.service.basic.*;
|
|
|
|
import com.glxp.api.admin.service.basic.BasicUnitMaintainService;
|
|
|
|
|
|
|
|
import com.glxp.api.admin.service.basic.BussinessTypeService;
|
|
|
|
|
|
|
|
import com.glxp.api.admin.service.basic.UdiInfoService;
|
|
|
|
|
|
|
|
import com.glxp.api.admin.service.basic.UdiRelevanceService;
|
|
|
|
import com.glxp.api.admin.service.business.StockOrderDetailService;
|
|
|
|
import com.glxp.api.admin.service.business.StockOrderDetailService;
|
|
|
|
import com.glxp.api.admin.service.business.StockOrderService;
|
|
|
|
import com.glxp.api.admin.service.business.StockOrderService;
|
|
|
|
import com.glxp.api.admin.service.info.CompanyProductRelevanceService;
|
|
|
|
import com.glxp.api.admin.service.info.CompanyProductRelevanceService;
|
|
|
|
import com.glxp.api.admin.service.info.CompanyService;
|
|
|
|
|
|
|
|
import com.glxp.api.admin.service.info.SystemParamConfigService;
|
|
|
|
|
|
|
|
import com.glxp.api.admin.service.inout.CodesService;
|
|
|
|
import com.glxp.api.admin.service.inout.CodesService;
|
|
|
|
import com.glxp.api.admin.service.inout.CodesTempService;
|
|
|
|
import com.glxp.api.admin.service.inout.CodesTempService;
|
|
|
|
import com.glxp.api.admin.service.inout.OrderDetailService;
|
|
|
|
import com.glxp.api.admin.service.inout.OrderDetailService;
|
|
|
|
import com.glxp.api.admin.service.inout.OrderService;
|
|
|
|
import com.glxp.api.admin.service.inout.OrderService;
|
|
|
|
import com.glxp.api.admin.service.inventory.*;
|
|
|
|
import com.glxp.api.admin.service.inventory.*;
|
|
|
|
import com.glxp.api.admin.service.thrsys.ThrDataService;
|
|
|
|
|
|
|
|
import com.glxp.api.admin.service.thrsys.ThrOrderService;
|
|
|
|
|
|
|
|
import com.glxp.api.admin.util.*;
|
|
|
|
import com.glxp.api.admin.util.*;
|
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
|
import org.slf4j.Logger;
|
|
|
|
import org.slf4j.Logger;
|
|
|
|
import org.slf4j.LoggerFactory;
|
|
|
|
import org.slf4j.LoggerFactory;
|
|
|
|
import org.springframework.beans.BeanUtils;
|
|
|
|
|
|
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
|
|
|
|
|
|
import org.springframework.scheduling.annotation.Async;
|
|
|
|
import org.springframework.scheduling.annotation.Async;
|
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
|
|
|
|
|
@ -528,7 +519,7 @@ public class IoTransInoutService {
|
|
|
|
if (originSupId != null) {
|
|
|
|
if (originSupId != null) {
|
|
|
|
warehouseEntity.setSupId(originSupId);
|
|
|
|
warehouseEntity.setSupId(originSupId);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (udiRelevanceEntities != null && udiRelevanceEntities.size() > 1 && warehouseEntity.getRelId() == null) {//同一个DI绑定多个产品西信息
|
|
|
|
if (udiRelevanceEntities != null && udiRelevanceEntities.size() > 1 && warehouseEntity.getRelId() == null) {//同一个DI绑定多个产品信息
|
|
|
|
warehouseEntity.setRelId(null);
|
|
|
|
warehouseEntity.setRelId(null);
|
|
|
|
warehouseEntity.setStatus(ConstantStatus.ORDER_DETAIL_DI_MUTI);
|
|
|
|
warehouseEntity.setStatus(ConstantStatus.ORDER_DETAIL_DI_MUTI);
|
|
|
|
} else if (udiRelevanceEntities == null || udiRelevanceEntities.size() == 0) {//未找到产品信息,一般不会出现
|
|
|
|
} else if (udiRelevanceEntities == null || udiRelevanceEntities.size() == 0) {//未找到产品信息,一般不会出现
|
|
|
|