|
|
@@ -9,7 +9,6 @@ import cn.hutool.core.util.ObjectUtil;
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
import com.alibaba.fastjson2.JSONObject;
|
|
|
import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
|
|
|
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
import com.fjhx.common.constant.SourceConstant;
|
|
|
import com.fjhx.item.entity.product.po.ProductInfo;
|
|
|
import com.fjhx.item.service.product.ProductInfoService;
|
|
|
@@ -20,7 +19,10 @@ import com.fjhx.tenant.entity.dict.po.DictTenantType;
|
|
|
import com.fjhx.tenant.service.dict.DictTenantDataService;
|
|
|
import com.fjhx.tenant.service.dict.DictTenantTypeService;
|
|
|
import com.fjhx.victoriatourist.entity.jd.dto.JdInfoDto;
|
|
|
-import com.fjhx.victoriatourist.entity.jd.po.*;
|
|
|
+import com.fjhx.victoriatourist.entity.jd.po.JdBack;
|
|
|
+import com.fjhx.victoriatourist.entity.jd.po.JdBackDetails;
|
|
|
+import com.fjhx.victoriatourist.entity.jd.po.JdOrder;
|
|
|
+import com.fjhx.victoriatourist.entity.jd.po.JdOrderDetails;
|
|
|
import com.fjhx.victoriatourist.entity.jd.vo.CommonDictData;
|
|
|
import com.fjhx.victoriatourist.entity.jd.vo.JdInfoVo;
|
|
|
import com.fjhx.victoriatourist.entity.jd.vo.TellBackOrderVO;
|
|
|
@@ -29,7 +31,6 @@ import com.fjhx.victoriatourist.service.jd.constants.InitDictConstant;
|
|
|
import com.fjhx.victoriatourist.service.jd.constants.JdParamConstant;
|
|
|
import com.fjhx.victoriatourist.service.jd.constants.RunParamConstant;
|
|
|
import com.fjhx.victoriatourist.service.jd.factory.JdClientFactory;
|
|
|
-import com.google.common.collect.ArrayTable;
|
|
|
import com.google.common.collect.HashBasedTable;
|
|
|
import com.google.common.collect.Table;
|
|
|
import com.jd.open.api.sdk.JdClient;
|
|
|
@@ -430,9 +431,15 @@ public class JdApiServiceImpl implements JdApiService {
|
|
|
item.setProductId(list.get(0).getId());
|
|
|
}
|
|
|
if(JdParamConstant.JD_ORDER_STATE_FINISH.equals(jdOrder.getState())){
|
|
|
- //如果京东采购单状态 = 已完成 & 明细数据中存在 实收 != 回告，则给京东采购单打上【异常】标记
|
|
|
+ //如果京东采购单状态 = 已完成 & 明细数据中存在 实收 != 回告 & 分流类型 == 仓库发货(10)，则给京东采购单打上【异常】标记
|
|
|
//如果实收>回告，则：给对应的明细打上【多货】标记;如果实收<回告，则：给对应的明细打上【少货】标记
|
|
|
- if(ObjectUtil.isNotNull(item.getActualNum()) && ObjectUtil.isNotNull(item.getConfirmNum()) && item.getActualNum().compareTo(item.getConfirmNum()) != 0){
|
|
|
+ if(
|
|
|
+ ObjectUtil.isNotNull(item.getActualNum())
|
|
|
+ && ObjectUtil.isNotNull(item.getConfirmNum())
|
|
|
+ && ObjectUtil.isNotEmpty(jdOrder.getDiversionType())
|
|
|
+ && item.getActualNum().compareTo(item.getConfirmNum()) != 0
|
|
|
+ && jdOrder.getDiversionType()==10
|
|
|
+ ){
|
|
|
String exDesc;
|
|
|
if (item.getActualNum().compareTo(item.getConfirmNum()) > 0){
|
|
|
exDesc = RunParamConstant.EXCESS;
|
yzc