From 942d486382c827b26e03bb9a12af0a51c6d0ed94 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" <123456> Date: Thu, 24 Aug 2023 11:35:45 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E6=A2=A6=E5=A4=A9=E7=9A=84?= =?UTF-8?q?=E5=8C=85=E9=97=B4=E5=93=81=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/AsyncDataServiceImpl.java | 49 ++++++++++++++++--- 1 file changed, 41 insertions(+), 8 deletions(-) diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/AsyncDataServiceImpl.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/AsyncDataServiceImpl.java index 281179741..2edefcae0 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/AsyncDataServiceImpl.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/AsyncDataServiceImpl.java @@ -302,7 +302,16 @@ public class AsyncDataServiceImpl implements IAsyncDataService { serviceNum.setCustomerName(StringUtil.isBlank(mtFactoryOrder.getCustomName()) ? "" : mtFactoryOrder.getCustomName());//顾客姓名 serviceNum.setCustomerPhone(StringUtil.isBlank(mtFactoryOrder.getCustomPhone()) ? "" : mtFactoryOrder.getCustomPhone()); //顾客电话 serviceNum.setCustomerRoad(StringUtil.isBlank(mtFactoryOrder.getCustomAddress()) ? "" : mtFactoryOrder.getCustomAddress()); //顾客地址 - serviceNum.setIsOpai(1); //是否干仓配 + + /** + * 如过是中心仓 是干仓配 如是转运车 非干干脆 0 + */ + if("中心仓".equals(mtFactoryOrderMain.getWarehouseType())){ + serviceNum.setIsOpai(1); //是否干仓配 + }else { //转运仓或者其它情况 + serviceNum.setIsOpai(0); //是否干仓配 + } + serviceNum.setCompleteSet("V"); //齐套标识：Y=齐套，N=未齐套，V=未知 // serviceNum.setCreateTime(LocalDate.now()); serviceNum.setDeleteTime(0); @@ -347,15 +356,23 @@ public class AsyncDataServiceImpl implements IAsyncDataService { advanceDetailEntity.setType(FactoryConstant.MENGT);//订单来源 advanceDetailEntity.setSystemType("线上");//订单类型 advanceDetailEntity.setOrderNum("");//MSCS单号 可以为空 - advanceDetailEntity.setIsOpai(0);//是否干仓配：1=是，0=否 - advanceDetailEntity.setMtdsNo(mtFactoryOrder.getProduceOrderCode());//MTDS单号 可以为空 - advanceDetailEntity.setFirstPackName("门");//一级品类 + + + + if("中心仓".equals(mtFactoryOrderMain.getWarehouseType())){ + advanceDetailEntity.setIsOpai(1); //是否干仓配 + }else { //转运仓或者其它情况 + advanceDetailEntity.setIsOpai(0); //是否干仓配 + } + + advanceDetailEntity.setMtdsNo(mtFactoryOrder.getProduceOrderCode());//MTDS单号 可以为空 + advanceDetailEntity.setFirstPackName(mtPackageInfo.getBigType());//一级品类 // advanceDetailEntity.setFirstPackName(StringUtil.isBlank(mtPackageInfo.getBigType())?"":mtPackageInfo.getBigType());//一级品类 advanceDetailEntity.setFirstPackCode("");//二级品类 advanceDetailEntity.setSiteName("");//基地名称 基地 TODO 需要映射 advanceDetailEntity.setSiteCode("");//基地编码 advanceDetailEntity.setProductCode(StringUtil.isBlank(mtPackageInfo.getPackageType()) ? "" : mtPackageInfo.getPackageType());//货品名称 可以为空 - advanceDetailEntity.setSecondPackName("");//二级品类名称 + advanceDetailEntity.setSecondPackName(mtPackageInfo.getColor());//二级品类名称 二级品这里使用的原始数据的颜色 advanceDetailEntity.setSecondPackCode("");//二级品类 advanceDetailEntity.setThirdPackName("");//三级品类名称 advanceDetailEntity.setThirdPackCode("");//三级品类 @@ -389,18 +406,34 @@ public class AsyncDataServiceImpl implements IAsyncDataService { advanceEntity.setMctsTruckNo(mtFactoryOrderMain.getSendCarNumber());// 车牌//字段没有了 advanceEntity.setFirstPackName(""); //一级品类 advanceEntity.setFirstPackCode(""); //一级品类 + advanceEntity.setDealerName(mtFactoryOrder.getDealerName()); //商场名称 advanceEntity.setDealerCode(StringUtil.isBlank(mtFactoryOrder.getDealerCode()) ? "" : mtFactoryOrder.getDealerCode()); //商场编码 + + + if("中心仓".equals(mtFactoryOrderMain.getWarehouseType())){ + advanceEntity.setIsOpai(1); //是否干仓配 + }else{ //转运仓或者其它情况 + advanceEntity.setIsOpai(0); //是否干仓配 + } advanceEntity.setDueDate(""); // 交期 - advanceEntity.setIsOpai(0); //是否干仓配 + + advanceEntity.setOrderNum("");//MSCS订单号 可以为空 advanceEntity.setCarrierName("汇通");//承运商 可以为空 advanceEntity.setCustomerName(StringUtil.isBlank(mtFactoryOrder.getCustomName()) ? "" : mtFactoryOrder.getCustomName()); //顾客名称 advanceEntity.setCustomerPhone(StringUtil.isBlank(mtFactoryOrder.getCustomPhone()) ? "" : mtFactoryOrder.getCustomPhone()); // 顾客电话 advanceEntity.setCustomerRoad(StringUtil.isBlank(mtFactoryOrder.getCustomAddress()) ? "" : mtFactoryOrder.getCustomAddress());//顾客地址 advanceEntity.setSystemType("线上"); //订单类型 - advanceEntity.setStoreNo(mtFactoryOrder.getExclusiveCode()); //门店编码 - advanceEntity.setStoreName(mtFactoryOrder.getExclusiveName()); //门店名称 + + +// advanceEntity.setStoreNo(mtFactoryOrder.getExclusiveCode()); //门店编码 +// advanceEntity.setStoreName(mtFactoryOrder.getExclusiveName()); //门店名称 + + //todo 这里是老系统无法呈现门店信息 所以将门店信息同步修改为经销商信息 + advanceEntity.setStoreNo(mtFactoryOrder.getDealerName()); // + advanceEntity.setStoreName(StringUtil.isBlank(mtFactoryOrder.getDealerCode()) ? "" : mtFactoryOrder.getDealerCode()); //门店名称 + advanceEntity.setSerialKey(""); //序列号 advanceEntity.setServiceNum(StringUtil.isBlank(mtFactoryOrder.getMainOrderCode()) ? "" : mtFactoryOrder.getMainOrderCode()); //服务号 advanceEntity.setMatingCode("");//齐套模式 可以为空