修改用户回显

blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/feign/IBasicMaterialClient.java

@@ -37,6 +37,7 @@ public interface IBasicMaterialClient {
     String API_PREFIX = "material/client";
     String TOP = API_PREFIX + "/top";
     String GETMATERIAL = API_PREFIX + "/getMaterial";
+    String GETMATERIALID = API_PREFIX + "/getMaterialId";
 
     /**
      * 获取物料基础信息列表
@@ -57,5 +58,11 @@ public interface IBasicMaterialClient {
 	 */
     @GetMapping(GETMATERIAL)
 	BasicMaterialEntity getMaterialOwn(@RequestParam("productCode") String productCode, @RequestParam("name") String name, @RequestParam("sku") String sku);
+	/**
+	 * 查询某个物理信息
+	 * @return
+	 */
+    @GetMapping(GETMATERIALID)
+	BasicMaterialEntity getMaterialOwnId(@RequestParam("materialId") Long materialId);
 
 }

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataClientEntity.java

@@ -86,6 +86,13 @@ public class BasicdataClientEntity extends TenantEntity {
 	@ApiModelProperty(value = "详细地址 ")
 	private String detailedly;
 
+	/**
+	 * 创建用户名称
+	 */
+	@ApiModelProperty(value = "创建用户名称 ")
+	@TableField(exist = false)
+	private String createUserName;
+
 	/**
 	 * 费用类型
 	 */

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionParcelListEntity.java

@@ -16,6 +16,7 @@
  */
 package com.logpm.distribution.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -114,6 +115,12 @@ public class DistributionParcelListEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "三级品")
 	private String thirdProduct;
+	/**
+	 * 客户id
+	 */
+	@ApiModelProperty(value = "客户id")
+	@TableField(exist = false)
+	private String marketId;
 	/**
 	 * 物料Id
 	 */

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockArticleEntity.java

@@ -66,6 +66,14 @@ public class DistributionStockArticleEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "预留5")
 	private String reserve5;
+
+	/**
+	 * 创建用户名称
+	 */
+	@ApiModelProperty(value = "创建用户名称 ")
+	@TableField(exist = false)
+	private String createUserName;
+
 	/**
 	 * 服务号
 	 */

blade-service/logpm-basic/src/main/java/com/logpm/basic/feign/BasicMaterialClient.java

@@ -25,6 +25,7 @@ import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import com.logpm.basic.entity.BasicMaterialEntity;
 import com.logpm.basic.service.IBasicMaterialService;
+import org.springblade.core.tool.utils.ObjectUtil;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 import springfox.documentation.annotations.ApiIgnore;
@@ -62,6 +63,7 @@ public class BasicMaterialClient implements IBasicMaterialClient {
 	 * @return
 	 */
 	@Override
+	@GetMapping(GETMATERIAL)
 	public BasicMaterialEntity getMaterialOwn(String productCode, String name, String sku) {
 		BasicMaterialEntity one = basicMaterialService.getOne(Wrappers.<BasicMaterialEntity>query().lambda()
 			.eq(StringUtils.isNotEmpty(productCode), BasicMaterialEntity::getProductCode, productCode)
@@ -71,4 +73,18 @@ public class BasicMaterialClient implements IBasicMaterialClient {
 		return one;
 	}
 
+	/**
+	 * 查询某个物料
+	 * @param id
+	 * @return
+	 */
+	@Override
+	@GetMapping(GETMATERIALID)
+	public BasicMaterialEntity getMaterialOwnId(Long id) {
+		BasicMaterialEntity one = basicMaterialService.getOne(Wrappers.<BasicMaterialEntity>query().lambda()
+			.eq(ObjectUtil.isNotEmpty(id), BasicMaterialEntity::getId, id)
+		);
+		return one;
+	}
+
 }

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

@@ -37,6 +37,8 @@ import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.constant.BladeConstant;
 import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.system.entity.User;
+import org.springblade.system.feign.IUserClient;
 import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
 
@@ -60,6 +62,8 @@ public class BasicdataClientController extends BladeController {
 
 	private final IBasicdataClientService basicdataClientService;
 
+	private final IUserClient userClient;
+
 	/**
 	 * 基础客户表 详情
 	 */
@@ -93,6 +97,12 @@ public class BasicdataClientController extends BladeController {
 			queryWrapper.eq("pid","0");
 		}
 		IPage<BasicdataClientEntity> pages = basicdataClientService.page(Condition.getPage(query),queryWrapper);
+//		pages.getRecords().forEach( i ->{
+//			if(!i.getCreateUser().equals(null)){
+//				R<User> userR = userClient.userInfoById(i.getCreateUser());
+//				i.setCreateUserName(userR.getData().getName());
+//			}
+//		});
 		return R.data(pages);
 	}
 
@@ -117,6 +127,16 @@ public class BasicdataClientController extends BladeController {
 		List<BasicdataClientEntity> pages = basicdataClientService.listName(name);
 		return R.data(pages);
 	}
+	/**
+	 * 基础客户表查询
+	 */
+	@GetMapping("/listCode")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入basicdataClient")
+	public R<List<BasicdataClientEntity>> listCode(String code) {
+		List<BasicdataClientEntity> pages = basicdataClientService.listCode(code);
+		return R.data(pages);
+	}
 
 	/**
 	 * 基础客户表 新增

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

@@ -79,4 +79,11 @@ public interface IBasicdataClientService extends BaseService<BasicdataClientEnti
 	 * @return
 	 */
 	boolean saveCustomerAndAddAcount(String phone,String name,Long clientId) throws NoSuchAlgorithmException;
+
+	/**
+	 * 查询客户编码
+	 * @param code
+	 * @return
+	 */
+	List<BasicdataClientEntity> listCode(String code);
 }

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

@@ -282,4 +282,16 @@ public class BasicdataClientServiceImpl extends BaseServiceImpl<BasicdataClientM
 		return isSuccess;
 	}
 
+	/**
+	 * 查询客户编码
+	 * @param code
+	 * @return
+	 */
+	@Override
+	public List<BasicdataClientEntity> listCode(String code) {
+		return baseMapper.selectList(Wrappers.<BasicdataClientEntity>query().lambda()
+			.eq(BasicdataClientEntity::getReserve1,code)
+		);
+	}
+
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java

@@ -40,7 +40,9 @@ import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.ObjectUtil;
 import org.springblade.system.entity.DictBiz;
+import org.springblade.system.entity.User;
 import org.springblade.system.feign.IDictBizClient;
+import org.springblade.system.feign.IUserClient;
 import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
 import wrapper.DistributionStockArticleWrapper;
@@ -65,6 +67,8 @@ public class DistributionStockArticleController extends BladeController {
 
 	private final IDictBizClient dictBizClient;
 
+	private final IUserClient userClient;
+
 	/**
 	 * 配送在库订单 详情
 	 */
@@ -95,7 +99,10 @@ public class DistributionStockArticleController extends BladeController {
 			queryWrapper.in("id",String.valueOf(d).split(","));
 		}
 		IPage<DistributionStockArticleEntity> pages = distributionStockArticleService.page(Condition.getPage(query), queryWrapper);
-
+		pages.getRecords().forEach( i ->{
+			R<User> userR = userClient.userInfoById(i.getCreateUser());
+			i.setCreateUserName(userR.getData().getName());
+		});
 		return R.data(DistributionStockArticleWrapper.build().pageVO(pages));
 
 	}

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java

@@ -16,12 +16,16 @@
  */
 package com.logpm.distribution.service.impl;
 
+import com.aliyuncs.unmarshaller.JsonUnmashaller;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.BeanUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
+import com.logpm.basic.entity.BasicMaterialEntity;
+import com.logpm.basic.feign.IBasicMaterialClient;
 import com.logpm.distribution.dto.DistributionStockArticleDTO;
 import com.logpm.distribution.entity.*;
 import com.logpm.distribution.excel.DistributionStockArticleExcel;
@@ -34,12 +38,15 @@ import com.logpm.distribution.vo.DistributionStockArticleVO;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.common.constant.DictBizConstant;
+import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.core.tool.utils.ObjectUtil;
 import org.springblade.system.cache.DictBizCache;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -75,6 +82,9 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 
 	private final IDistributionParcelListService distributionParcelListService;
 
+	private final IDistributionParcelDetailsService distributionParcelDetailsService;
+	private final IBasicMaterialClient basicMaterialClient;
+
 
 	@Override
 	public IPage<DistributionStockArticleVO> selectDistributionStockArticlePage(IPage<DistributionStockArticleVO> page, DistributionStockArticleVO distributionStockArticle) {
@@ -99,7 +109,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public Boolean saveStock(String ids) {
-		try {
+//		try {
 			if (StringUtils.isNotBlank(ids)) {
 				//查询
 				List<DistributionParcelListEntity> list1 = distributionParcelListService.list(Wrappers.<DistributionParcelListEntity>query().lambda()
@@ -112,8 +122,25 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 //						.eq(DistributionStockListEntity::getServiceNumber,i.getServiceNumber())
 //						.eq(DistributionStockListEntity::getMaterial,i.getMaterial())
 //					);
-						// 添加库存品信息
-						addStockList(i, 1);
+						//查询包件有没有物料
+						List<DistributionParcelDetailsEntity> list = distributionParcelDetailsService.list(Wrappers.<DistributionParcelDetailsEntity>query().lambda()
+							.eq(DistributionParcelDetailsEntity::getParcelListId, i.getId())
+						);
+						if(list.size() > 0){
+							list.forEach( a ->{
+								DistributionParcelListEntity parcelListEntity = new DistributionParcelListEntity();
+								BeanUtil.copyProperties(i,parcelListEntity);
+								parcelListEntity.setMaterialName(a.getName());
+								parcelListEntity.setMaterialCode(a.getEncoded());
+								parcelListEntity.setMaterialUnit(a.getUnit());
+								// 添加库存品信息
+								addStockList(parcelListEntity, 1);
+							} );
+						}else{
+							// 添加库存品信息
+							addStockList(i, 1);
+						}
+
 					});
 					String[] split = ids.split(",");
 					for (int i = 0; i < split.length; i++) {
@@ -127,10 +154,10 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 				}
 			}
 			return false;
-		} catch (Exception e) {
-			log.info("异常", e.getMessage());
-			return null;
-		}
+//		} catch (Exception e) {
+//			log.info("异常", e.getMessage());
+//			return false;
+//		}
 	}
 
 	@Override
@@ -249,10 +276,14 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 	 * @param distributionParcelList 包件信息
 	 * @return
 	 */
+	@Transactional(rollbackFor = Exception.class)
 	public DistributionStockArticleEntity addStockList(DistributionParcelListEntity distributionParcelList, Integer qu) {
+
 		//查询在库订单信息
 		DistributionStockArticleEntity distributionStockArticleEntity = baseMapper.selectById(distributionParcelList.getStockArticleId());
-
+		if(ObjectUtil.isEmpty(distributionStockArticleEntity.getMallId()) || distributionStockArticleEntity.getMallId().equals("-1")  ){
+			throw new ServiceException("客户数据异常，无法转换！！");
+		}
 		DistributionStockListEntity distributionStockListEntity = new DistributionStockListEntity();
 
 		distributionStockListEntity.setStockArticleId(Optional.ofNullable(distributionParcelList.getStockArticleId()).orElse(null)); //订单ID
@@ -278,6 +309,10 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 		distributionStockListEntity.setStoreName(Optional.ofNullable(distributionStockArticleEntity.getStoreName()).orElse(null));//门店名称
 		distributionStockListEntity.setFactory(Optional.ofNullable(distributionStockArticleEntity.getFactoryTrain()).orElse(null));//工厂车次
 		distributionStockListEntity.setCategory(Optional.ofNullable(distributionParcelList.getBrandId()).orElse(null));//品分类
+		distributionStockListEntity.setUnpackingQuantity(0);
+		distributionStockListEntity.setTrayName(Optional.ofNullable(distributionParcelList.getPallet()).orElse(null));
+		BasicMaterialEntity materialOwnId = basicMaterialClient.getMaterialOwnId(distributionParcelList.getMaterialId());
+		distributionStockListEntity.setSku(materialOwnId.getSku());
 		distributionStockListEntity.setMaterialId(Optional.ofNullable(distributionParcelList.getMaterialId()).orElse(null));//货物ID
 		distributionStockListEntity.setParcelListId(distributionParcelList.getId());//包件id
 		distributionStockListEntity.setQuantityOccupied(0);//冻结数量