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 dceccd279..86bf3c7a3 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,8 +356,16 @@ public class AsyncDataServiceImpl implements IAsyncDataService { advanceDetailEntity.setType(FactoryConstant.MENGT);//订单来源 advanceDetailEntity.setSystemType("线上");//订单类型 advanceDetailEntity.setOrderNum("");//MSCS单号 可以为空 - advanceDetailEntity.setIsOpai(0);//是否干仓配:1=是,0=否 - advanceDetailEntity.setMtdsNo(mtFactoryOrder.getProduceOrderCode());//MTDS单号 可以为空 + + + + if("中心仓".equals(mtFactoryOrderMain.getWarehouseType())){ + advanceDetailEntity.setIsOpai(1); //是否干仓配 + }else { //转运仓或者其它情况 + advanceDetailEntity.setIsOpai(0); //是否干仓配 + } + + advanceDetailEntity.setMtdsNo(mtFactoryOrder.getProduceOrderCode());//MTDS单号 可以为空 advanceDetailEntity.setFirstPackName("门");//一级品类 // advanceDetailEntity.setFirstPackName(StringUtil.isBlank(mtPackageInfo.getBigType())?"":mtPackageInfo.getBigType());//一级品类 advanceDetailEntity.setFirstPackCode("");//二级品类 @@ -394,8 +411,16 @@ public class AsyncDataServiceImpl implements IAsyncDataService { 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()); //顾客名称