1.增加对客户账号列表的支持 ，增加志邦对接的字段

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataClientAccountVO.java

@@ -0,0 +1,22 @@
+package com.logpm.basicdata.vo;
+
+import com.logpm.basicdata.entity.BasicdataClientUserEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class BasicdataClientAccountVO extends BasicdataClientUserEntity {
+
+	@ApiModelProperty(value = "姓名")
+	private String name;
+
+	@ApiModelProperty(value = "电话|账号")
+	private String phone;
+
+
+
+
+
+}

blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/zb/entity/ZbOrderPackageEntity.java

@@ -93,6 +93,9 @@ public class ZbOrderPackageEntity extends BaseEntity {
 	 */
 	@ApiModelProperty(name = "包件大类", notes = "")
 	private String packageType;
+
+	@ApiModelProperty(name = "大类名称", notes = "")
+	private String packageTypeName;
 	/**
 	 * 定制标志位 Y/N
 	 */
@@ -133,6 +136,10 @@ public class ZbOrderPackageEntity extends BaseEntity {
 	 */
 	@ApiModelProperty(name = "重量", notes = "")
 	private String totalGrossWeight;
+
+	@ApiModelProperty(name = "模式 CP:仓配 ZZ：中转", notes = "")
+	private String modeType;
+
 	/**
 	 * 入库单状态 正常 作废
 	 */

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataClientAccountController.java

@@ -0,0 +1,64 @@
+package com.logpm.basicdata.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.logpm.basicdata.entity.BasicdataClientEntity;
+import com.logpm.basicdata.service.IBasicdataClientUserService;
+import com.logpm.basicdata.vo.BasicdataClientAccountVO;
+import com.logpm.basicdata.vo.BasicdataClientVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.extern.log4j.Log4j2;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.security.NoSuchAlgorithmException;
+
+@RestController
+@AllArgsConstructor
+@RequestMapping("/basicdataClientAccount")
+@Api(value = "客户账号列表", tags = "客户账号列表")
+@Log4j2
+public class BasicdataClientAccountController extends BladeController {
+
+
+	private final IBasicdataClientUserService basicdataClientUserService;
+
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入basicdataClient")
+	public R<IPage<BasicdataClientAccountVO>> page(BasicdataClientAccountVO basicdataClientAccountVO, Query query) {
+		IPage<BasicdataClientAccountVO> pages = basicdataClientUserService.selectBasicdataClientAccountPage(Condition.getPage(query), basicdataClientAccountVO);
+		return R.data(pages);
+	}
+
+
+	/**
+	 * 基础客户表 新增或修改
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入basicdataClient")
+	public R submit(@Valid @RequestBody BasicdataClientAccountVO basicdataClientAccountVO) throws NoSuchAlgorithmException {
+		return R.status(basicdataClientUserService.ownSaveOrUpdate(basicdataClientAccountVO));
+	}
+
+	/**
+	 * 基础客户表 删除
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(basicdataClientUserService.ownDeleteLogic(Func.toLongList(ids)));
+	}
+
+
+}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/CommonController.java

@@ -17,23 +17,5 @@ import org.springframework.web.multipart.MultipartFile;
 @Slf4j
 public class CommonController {
 
-	private MinioTemplate minioTemplate;
-	@SneakyThrows
-	@PostMapping("/uploadFile")
-	public R<BladeFile> uploadFile(@RequestParam MultipartFile file){
-		log.info("传入>>>>>>>>>>{}",file);
-		BladeFile bladeFile = minioTemplate.putFile(file);
-		return R.data(bladeFile);
-	}
 
-	/**
-	 * 根据文件路径得到MinIO预览文件绝对地址
-	 *
-	 * @param fileName    文件路径
-	 * @return
-	 */
-	@PostMapping("/getPreviewFileUrl")
-	public String getPreviewFileUrl(@RequestParam String fileName) {
-		return minioTemplate.filePath( fileName);
-	}
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataWarehouseClient.java

@@ -103,7 +103,7 @@ public class BasicdataWarehouseClient implements IBasicdataWarehouseClient {
 
 		List<BasicdataWarehouseEntity> list = warehouseWarehouseService.list(queryWrapper);
 
-		if(!Objects.isNull(list) && list.size()>0){
+		if(!Objects.isNull(list) && !list.isEmpty()){
 			return list.get(0);
 		}else{
 			return null;
@@ -118,8 +118,7 @@ public class BasicdataWarehouseClient implements IBasicdataWarehouseClient {
 	@GetMapping(API_PREFIX+"/getMyWarehouseList")
 	@Override
 	public List<BasicdataWarehouseEntity> getMyWarehouseList() {
-		List<BasicdataWarehouseEntity> myWarehouseList = warehouseWarehouseService.getMyWarehouseList();
+        return warehouseWarehouseService.getMyWarehouseList();
-		return myWarehouseList;
 	}
 
 	/**

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataClientUserMapper.java

@@ -24,6 +24,7 @@ import com.logpm.basicdata.entity.BasicdataClientEntity;
 import com.logpm.basicdata.entity.BasicdataClientUserEntity;
 import com.logpm.basicdata.excel.BasicdataCarrierExcel;
 import com.logpm.basicdata.vo.BasicdataCarrierVO;
+import com.logpm.basicdata.vo.BasicdataClientAccountVO;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -39,4 +40,5 @@ public interface BasicdataClientUserMapper extends BaseMapper<BasicdataClientUse
 
 	List<BasicdataClientEntity> getBasicdataClientUserEntityListByUserId(@Param("userId") Long userId);
 
+    List<BasicdataClientUserEntity> selectBasicdataClientAccountPage(IPage<BasicdataClientAccountVO> page, BasicdataClientAccountVO basicdataClientAccountVO);
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataClientUserMapper.xml

@@ -27,4 +27,12 @@
     </select>
 
 
+    <select id="selectBasicdataClientAccountPage" resultType="com.logpm.basicdata.entity.BasicdataClientUserEntity">
+        SELECT
+        lbc1.*
+        FROM
+        logpm_basicdata_clientuser lbc1 where lbc1.client_id=#{basicdataClientAccountVO.clientId}
+    </select>
+
+
 </mapper>

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataClientService.java

@@ -78,7 +78,6 @@ public interface IBasicdataClientService extends BaseService<BasicdataClientEnti
 	 *
 	 * @return
 	 */
-	boolean saveCustomerAndAddAcount(String phone,String name,Long clientId) throws NoSuchAlgorithmException;
 
 	/**
 	 * 查询客户编码

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataClientUserService.java

@@ -1,7 +1,9 @@
 package com.logpm.basicdata.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.logpm.basicdata.entity.BasicdataClientEntity;
 import com.logpm.basicdata.entity.BasicdataClientUserEntity;
+import com.logpm.basicdata.vo.BasicdataClientAccountVO;
 import org.springblade.core.mp.base.BaseService;
 
 import java.util.List;
@@ -14,4 +16,21 @@ public interface IBasicdataClientUserService extends BaseService<BasicdataClient
 	 * @return
 	 */
 	List<BasicdataClientEntity> getBasicdataClientUserEntityListByUserId(Long userId);
+
+	/**
+	 * 查询当前客户下面的账号列表
+	 * @param page
+	 * @param basicdataClientAccountVO
+	 * @return
+	 */
+	IPage<BasicdataClientAccountVO> selectBasicdataClientAccountPage(IPage<BasicdataClientAccountVO> page, BasicdataClientAccountVO basicdataClientAccountVO);
+
+	/**
+	 * 新增或者修改
+	 * @param basicdataClientAccountVO
+	 * @return
+	 */
+	boolean ownSaveOrUpdate(BasicdataClientAccountVO basicdataClientAccountVO);
+
+	boolean ownDeleteLogic(List<Long> longList);
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataClientServiceImpl.java

@@ -62,7 +62,7 @@ public class BasicdataClientServiceImpl extends BaseServiceImpl<BasicdataClientM
 	private final IBasicdataStoreContactService basicdataStoreContactService;
 	private final IBasicdataStoreBusinessService basicdataStoreBusinessService;
 	private final IBasicdataTripartiteMallService basicdataTripartiteMallService;
-	private final IBasicdataClientUserService basicdataClientUserService;
+//	private final IBasicdataClientUserService basicdataClientUserService;
 
 
 	private final IUserClient userClient;
@@ -145,8 +145,8 @@ public class BasicdataClientServiceImpl extends BaseServiceImpl<BasicdataClientM
 			}
 			//添加
 			this.save(basicdataClient);
-			//绑定客户账号和客户关系
+//			//绑定客户账号和客户关系
-			this.saveCustomerAndAddAcount(phone,linkman,basicdataClient.getId());
+//			this.saveCustomerAndAddAcount(phone,linkman,basicdataClient.getId());
 
 
 			//添加联系人
@@ -224,7 +224,7 @@ public class BasicdataClientServiceImpl extends BaseServiceImpl<BasicdataClientM
 			List<BasicdataClientEntity> basicdataClientEntities = baseMapper.selectList(Wrappers.<BasicdataClientEntity>query().lambda()
 				.eq(BasicdataClientEntity::getPid, i)
 			);
-			if (basicdataClientEntities.size() > 0) {
+			if (!basicdataClientEntities.isEmpty()) {
 				baseMapper.deleteBatchIds(basicdataClientEntities);
 			}
 
@@ -239,46 +239,7 @@ public class BasicdataClientServiceImpl extends BaseServiceImpl<BasicdataClientM
 		return one;
 	}
 
-	@Override
-	public boolean saveCustomerAndAddAcount(String phone,String name,Long clientId) throws NoSuchAlgorithmException {
-
-			boolean isSuccess =false;
-			// 客户电话作为客户的账号登录
-			R<User> r = userClient.userByAccount(AuthUtil.getTenantId(), phone);
-			// 标识这个账户不存在 需要新建
-			User u = r.getData();
-			if (ObjectUtil.isEmpty(u)) {
-				// 标识这个账户不存在 需要新建
-				u = new User();
-				u.setAccount(phone);
-				u.setTenantId(AuthUtil.getTenantId());
-				u.setUserType(1);// Web
-				String defaultPassword = DictBizCache.getValue(DictBizConstant.DEFAULT_PASSWORD, DictBizConstant.DEFAULT_PASSWORD);
-				// 加密
-				u.setPassword(defaultPassword);
-
-				u.setName(name);
-				u.setRealName(name);
-				u.setPhone(phone);
-				String defaultRoleId = DictBizCache.getValue(DictBizConstant.DEFAULT_MALL_ROLE_ID, DictBizConstant.DEFAULT_MALL_ROLE_ID);
-				u.setRoleId(defaultRoleId);
-
-				String defaultDeptId = DictBizCache.getValue(DictBizConstant.DEFAULT_DEPT_ID, DictBizConstant.DEFAULT_DEPT_ID);
-				u.setDeptId(defaultDeptId);
-				userClient.saveUser(u);
-
-			}
-			// 建立客户和用户的绑定关系
-			BasicdataClientUserEntity basicdataClientUserEntity = new BasicdataClientUserEntity();
-			basicdataClientUserEntity.setClientId(clientId);
-			basicdataClientUserEntity.setUserId(u.getId());
 
-			// 保存
-			isSuccess = basicdataClientUserService.save(basicdataClientUserEntity);
-
-			// todo 这里在修改客户的默认联系的人时候需要去更新这个账号的登录账号 目前优先流程
-		return isSuccess;
-	}
 
 	/**
 	 * 查询客户编码

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataClientUserServiceImpl.java

@@ -1,23 +1,148 @@
 package com.logpm.basicdata.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.logpm.basicdata.entity.BasicdataClientEntity;
 import com.logpm.basicdata.entity.BasicdataClientUserEntity;
 import com.logpm.basicdata.mapper.BasicdataClientUserMapper;
+import com.logpm.basicdata.service.IBasicdataClientService;
 import com.logpm.basicdata.service.IBasicdataClientUserService;
+import com.logpm.basicdata.service.IBasicdataStoreContactService;
+import com.logpm.basicdata.vo.BasicdataClientAccountVO;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.checkerframework.checker.units.qual.A;
+import org.springblade.common.constant.DictBizConstant;
 import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.ObjectUtil;
+import org.springblade.system.cache.DictBizCache;
+import org.springblade.system.entity.User;
+import org.springblade.system.entity.UserInfo;
+import org.springblade.system.feign.ISysClient;
+import org.springblade.system.feign.IUserClient;
 import org.springframework.stereotype.Service;
 
+import java.security.NoSuchAlgorithmException;
+import java.util.ArrayList;
 import java.util.List;
 
 @Slf4j
 @Service
 @AllArgsConstructor
 public class BasicdataClientUserServiceImpl extends BaseServiceImpl<BasicdataClientUserMapper, BasicdataClientUserEntity> implements IBasicdataClientUserService {
+
+	private final IUserClient userClient;
+
+	private final IBasicdataClientService basicdataClientService;
+
 	@Override
 	public List<BasicdataClientEntity> getBasicdataClientUserEntityListByUserId(Long userId) {
 		return baseMapper.getBasicdataClientUserEntityListByUserId(userId);
 
 	}
+
+	@Override
+	public IPage<BasicdataClientAccountVO> selectBasicdataClientAccountPage(IPage<BasicdataClientAccountVO> page, BasicdataClientAccountVO basicdataClientAccountVO) {
+		List<BasicdataClientUserEntity> ls = baseMapper.selectBasicdataClientAccountPage(page, basicdataClientAccountVO);
+
+		List<BasicdataClientAccountVO> result = new ArrayList<>();
+		for (BasicdataClientUserEntity l : ls) {
+			BasicdataClientAccountVO basicdataClientAccountVO1 = new BasicdataClientAccountVO();
+			basicdataClientAccountVO1.setClientId(l.getClientId());
+			basicdataClientAccountVO1.setUserId(l.getUserId());
+			basicdataClientAccountVO1.setCreateTime(l.getCreateTime());
+
+			R<User> r = userClient.userInfoById(basicdataClientAccountVO1.getUserId());
+			if (r.isSuccess()) {
+				User u = r.getData();
+				basicdataClientAccountVO1.setName(u.getName());
+				basicdataClientAccountVO1.setPhone(u.getPhone());
+
+			}
+			result.add(basicdataClientAccountVO1);
+
+		}
+		page.setRecords(result);
+
+		return page;
+	}
+
+	@Override
+	public boolean ownSaveOrUpdate(BasicdataClientAccountVO basicdataClientAccountVO) {
+
+		if (basicdataClientAccountVO.getId() != null) {
+			// 修改
+			return false;
+		} else {
+			// 新增
+			try {
+				return saveCustomerAndAddAcount(basicdataClientAccountVO.getPhone(), basicdataClientAccountVO.getName(), basicdataClientAccountVO.getClientId());
+			} catch (NoSuchAlgorithmException e) {
+				log.error("新增客户账户异常");
+				throw new RuntimeException(e);
+			}
+
+		}
+	}
+
+	/**
+	 * 保存客户账号信息
+	 *
+	 * @param phone
+	 * @param name
+	 * @param clientId
+	 * @return
+	 * @throws NoSuchAlgorithmException
+	 */
+	public boolean saveCustomerAndAddAcount(String phone, String name, Long clientId) throws NoSuchAlgorithmException {
+		boolean isSuccess = false;
+		// 客户电话作为客户的账号登录
+		R<User> r = userClient.userByAccount(AuthUtil.getTenantId(), phone);
+		// 标识这个账户不存在 需要新建
+		User u = r.getData();
+		if (ObjectUtil.isEmpty(u)) {
+			// 标识这个账户不存在 需要新建
+			u = new User();
+			u.setAccount(phone);
+			u.setTenantId(AuthUtil.getTenantId());
+			u.setUserType(1);// Web
+			String defaultPassword = DictBizCache.getValue(DictBizConstant.DEFAULT_PASSWORD, DictBizConstant.DEFAULT_PASSWORD);
+			// 加密
+			u.setPassword(defaultPassword);
+
+			u.setName(name);
+			u.setRealName(name);
+			u.setPhone(phone);
+			String defaultRoleId = DictBizCache.getValue(DictBizConstant.DEFAULT_MALL_ROLE_ID, DictBizConstant.DEFAULT_MALL_ROLE_ID);
+			u.setRoleId(defaultRoleId);
+
+			String defaultDeptId = DictBizCache.getValue(DictBizConstant.DEFAULT_DEPT_ID, DictBizConstant.DEFAULT_DEPT_ID);
+			u.setDeptId(defaultDeptId);
+			userClient.saveUser(u);
+
+			// 获取ID
+			R<UserInfo> userInfoR = userClient.userInfo(AuthUtil.getTenantId(), u.getAccount());
+			if (userInfoR.isSuccess()) {
+				u = userInfoR.getData().getUser();
+			}
+
+		}
+		// 建立客户和用户的绑定关系
+		BasicdataClientUserEntity basicdataClientUserEntity = new BasicdataClientUserEntity();
+		basicdataClientUserEntity.setClientId(clientId);
+		basicdataClientUserEntity.setUserId(u.getId());
+
+		// 保存
+		isSuccess = save(basicdataClientUserEntity);
+
+		return isSuccess;
+	}
+
+	@Override
+	public boolean ownDeleteLogic(List<Long> longList) {
+
+		return false;
+
+	}
 }

blade-service/logpm-basicdata/src/main/resources/application.yml

@@ -10,23 +10,7 @@ swagger:
     - org.springblade
     - com.logpm
 
-#oss配置
+
-oss:
-  enabled: true
-  name: minio
-  tenant-mode: false
-  endpoint: http://192.168.2.100:9000
-  access-key: minio
-  secret-key: 123123123
-  bucket-name: logpm
-
-#blade配置
-blade:
-  #本地文件上传
-  file:
-    remote-mode: true
-    upload-domain: http://localhost:8999
-    remote-path: /usr/share/nginx/html
 
 logging:
   config: classpath:logback.xml

blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/AsyncDataServiceImpl.java

@@ -760,11 +760,12 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
 		advanceDetailEntity.setOrderNum("");//MSCS单号  可以为空
 		advanceDetailEntity.setIsOpai(0);//是否干仓配：1=是，0=否
 		advanceDetailEntity.setMtdsNo("");//MTDS单号 可以为空
-		advanceDetailEntity.setFirstPackName(StringUtil.isBlank(serviceNumEntity.getPackageType()) ? "" : serviceNumEntity.getPackageType());//一级品类
-		advanceDetailEntity.setFirstPackCode("");//二级品类
 		advanceDetailEntity.setSiteName("");//基地名称  基地
 		advanceDetailEntity.setSiteCode("");//基地编码
 		advanceDetailEntity.setProductCode("");//货品名称 可以为空
+		advanceDetailEntity.setFirstPackName(StringUtil.isBlank(serviceNumEntity.getPackageTypeName()) ? "" : serviceNumEntity.getPackageTypeName());//一级品类
+		advanceDetailEntity.setFirstPackCode(StringUtil.isBlank(serviceNumEntity.getPackageType()) ? "" : serviceNumEntity.getPackageType());//二级品类
+
 		advanceDetailEntity.setSecondPackName(StringUtil.isBlank(serviceNumEntity.getPackageClass()) ? "" : serviceNumEntity.getPackageClass());//二级品类名称
 		advanceDetailEntity.setSecondPackCode("");//二级品类
 		advanceDetailEntity.setThirdPackName(StringUtil.isBlank(serviceNumEntity.getPackageClass()) ? "" : serviceNumEntity.getPackageClass());//三级品类名称
@@ -867,8 +868,8 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
 		advanceEntity.setMctsTruck(StringUtil.isBlank(zbReceiptEntity.getDepartCode()) ? "" : zbReceiptEntity.getDepartCode()); //车次
 		advanceEntity.setMctsTruckNo(zbReceiptEntity.getCarNumber());
 		advanceEntity.setMtdsNo("");// MTDS单号 可以为空
-		advanceEntity.setFirstPackName(""); //一级品类
+		advanceEntity.setFirstPackName(serviceNumEntity.getPackageTypeName()); //一级品类
-		advanceEntity.setFirstPackCode(""); //一级品类
+		advanceEntity.setFirstPackCode(serviceNumEntity.getPackageType()); //一级品类
 		advanceEntity.setDealerName(serviceNumEntity.getCustomerName()); //商场名称
 		advanceEntity.setDealerCode(StringUtil.isBlank(serviceNumEntity.getCustomerCode()) ? "" : serviceNumEntity.getCustomerCode()); //商场编码
 		advanceEntity.setDueDate(""); // 交期
@@ -886,17 +887,16 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
 		advanceEntity.setMatingCode("");//齐套模式 可以为空
 		advanceEntity.setContractNum("");//合同号 可以为空
 		advanceEntity.setLeaveBehind(serviceNumEntity.getLegacyFlag());//遗留：Y=是，N=否
-		advanceEntity.setSenderMobile(StringUtil.isBlank(serviceNumEntity.getRelationOrderCode()) ? "" : serviceNumEntity.getRelationOrderCode());//发货人电话 可以为空
+		advanceEntity.setSenderMobile(StringUtil.isBlank(zbReceiptEntity.getSenderMobile()) ? "" : zbReceiptEntity.getSenderMobile());//发货人电话 可以为空
 		advanceEntity.setSenderAddress(StringUtil.isBlank(zbReceiptEntity.getSenderAddress()) ? "" : zbReceiptEntity.getSenderAddress()); //发货地址 可以为空
 		advanceEntity.setSenderName(StringUtil.isBlank(zbReceiptEntity.getSenderName()) ? "" : zbReceiptEntity.getSenderName()); //发货工厂名称 可以为空
-		// todo 需要运营提供
+		// todo 需要运营提供 1080为线上测试环境
-		advanceEntity.setAdministratorsId(0);// 导入人
+		advanceEntity.setAdministratorsId(1080);// 导入人
 		advanceEntity.setCreateTime(initTimestamp()); //添加时间
 		advanceEntity.setCarsNum(""); //派车单--snm 可以为空
 		advanceEntity.setDeleteTime(0); // 删除时间
 		advanceEntity.setWaybillNo("");//运单号  可以为空
-		//todo 需要运营提供
+		Integer warehouseId = 54;
-		Integer warehouseId = 0;
 		advanceEntity.setWarehouseId(warehouseId); //导入人仓库id
 
 		advanceEntity.setWaybillStatus(Byte.parseByte("1"));//开单状态：1=未开单，2=已开单