Merge branch 'dev' into pre-production

blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseWayBillDetail.java

@@ -13,7 +13,7 @@ public class WarehouseWayBillDetail extends BaseEntity {
 
 	/** 运单号 */
 	@ApiModelProperty(name = "运单号",notes = "")
-	private String waybillCode;
+	private String waybillNo;
 
 	/** 运单号id */
 	@ApiModelProperty(name = "运单id",notes = "")

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

@@ -16,6 +16,7 @@
  */
 package com.logpm.basicdata.controller;
 
+import com.logpm.basicdata.dto.BasicdataTeamStaffDTO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -116,7 +117,7 @@ public class BasicdataTeamStaffController extends BladeController {
 	@PostMapping("/submit")
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "新增或修改", notes = "传入basicdataTeamStaff")
-	public R submit(@Valid @RequestBody BasicdataTeamStaffEntity basicdataTeamStaff) {
+	public R submit(@Valid @RequestBody BasicdataTeamStaffDTO basicdataTeamStaff) {
 		return R.status(basicdataTeamStaffService.saveOrUpdateOwn(basicdataTeamStaff));
 	}
 

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataTeamStaffDTO.java

@@ -20,6 +20,8 @@ import com.logpm.basicdata.entity.BasicdataTeamStaffEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.List;
+
 /**
  * 班组人员表 数据传输对象实体类
  *
@@ -31,4 +33,6 @@ import lombok.EqualsAndHashCode;
 public class BasicdataTeamStaffDTO extends BasicdataTeamStaffEntity {
 	private static final long serialVersionUID = 1L;
 
+	private List<String> staffIds;
+
 }

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

@@ -17,6 +17,7 @@
 package com.logpm.basicdata.service;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.logpm.basicdata.dto.BasicdataTeamStaffDTO;
 import com.logpm.basicdata.entity.BasicdataTeamStaffEntity;
 import com.logpm.basicdata.vo.BasicdataTeamStaffVO;
 import com.logpm.basicdata.excel.BasicdataTeamStaffExcel;
@@ -49,5 +50,5 @@ public interface IBasicdataTeamStaffService extends BaseService<BasicdataTeamSta
 	 */
 	List<BasicdataTeamStaffExcel> exportBasicdataTeamStaff(Wrapper<BasicdataTeamStaffEntity> queryWrapper);
 
-    Boolean saveOrUpdateOwn(BasicdataTeamStaffEntity basicdataTeamStaff);
+    Boolean saveOrUpdateOwn(BasicdataTeamStaffDTO basicdataTeamStaff);
 }

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

@@ -16,10 +16,11 @@
  */
 package com.logpm.basicdata.service.impl;
 
+import com.baomidou.mybatisplus.core.toolkit.BeanUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.logpm.basicdata.dto.BasicdataTeamStaffDTO;
 import com.logpm.basicdata.entity.BasicdataTeamStaffEntity;
-import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
 import com.logpm.basicdata.service.IBasicdataWarehouseService;
 import com.logpm.basicdata.vo.BasicdataTeamStaffVO;
 import com.logpm.basicdata.excel.BasicdataTeamStaffExcel;
@@ -27,10 +28,16 @@ import com.logpm.basicdata.mapper.BasicdataTeamStaffMapper;
 import com.logpm.basicdata.service.IBasicdataTeamStaffService;
 import lombok.AllArgsConstructor;
 import org.springblade.core.log.exception.ServiceException;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.system.entity.User;
+import org.springblade.system.feign.IUserClient;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseServiceImpl;
+
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -45,6 +52,8 @@ public class BasicdataTeamStaffServiceImpl extends BaseServiceImpl<BasicdataTeam
 
 	private final IBasicdataWarehouseService basicdataWarehouseService;
 
+	private IUserClient userClient;
+
 	@Override
 	public IPage<BasicdataTeamStaffVO> selectBasicdataTeamStaffPage(IPage<BasicdataTeamStaffVO> page, BasicdataTeamStaffVO basicdataTeamStaff) {
 		return page.setRecords(baseMapper.selectBasicdataTeamStaffPage(page, basicdataTeamStaff));
@@ -66,27 +75,42 @@ public class BasicdataTeamStaffServiceImpl extends BaseServiceImpl<BasicdataTeam
 	 * @return
 	 */
 	@Override
-	public Boolean saveOrUpdateOwn(BasicdataTeamStaffEntity basicdataTeamStaff) {
+	public Boolean saveOrUpdateOwn(BasicdataTeamStaffDTO basicdataTeamStaff) {
 		if(ObjectUtils.isNull(basicdataTeamStaff)){
 			throw new ServiceException("参数不全！！");
 		}
-		BasicdataWarehouseEntity one = basicdataWarehouseService.getOne(Wrappers.<BasicdataWarehouseEntity>query().lambda().eq(BasicdataWarehouseEntity::getId, basicdataTeamStaff.getWarehouseId()));
-		if(ObjectUtils.isNull(one)){
-			throw new ServiceException("仓库数据异常！！");
-		}
-		if(ObjectUtils.isNotNull(basicdataTeamStaff.getId())){
+
+		/*if(ObjectUtils.isNotNull(basicdataTeamStaff.getId())){
 			//修改
 			basicdataTeamStaff.setDepartment(one.getDepartment());
 			basicdataTeamStaff.setDepartmentName(one.getDepartmentName());
 			this.updateById(basicdataTeamStaff);
 			return true;
-		}else{
-			//添加
-			basicdataTeamStaff.setDepartment(one.getDepartment());
-			basicdataTeamStaff.setDepartmentName(one.getDepartmentName());
-			this.save(basicdataTeamStaff);
-			return true;
-		}
+		}else{*/
+
+
+		//添加
+		List<BasicdataTeamStaffEntity> list = new ArrayList<>();
+			basicdataTeamStaff.getStaffIds().forEach(i ->{
+				//查询是否已存在
+				List<BasicdataTeamStaffEntity> list1 = baseMapper.selectList(Wrappers.<BasicdataTeamStaffEntity>query().lambda()
+					.eq(BasicdataTeamStaffEntity::getStaffId, i)
+					.eq(BasicdataTeamStaffEntity::getWarehouseId, basicdataTeamStaff.getWarehouseId())
+					.eq(BasicdataTeamStaffEntity::getIsDeleted,0)
+				);
+				if(list1.size() > 0){
+					throw new ServiceException("人员已存在，不能重复添加！");
+				}
+				R<User> userR = userClient.userInfoById(Long.valueOf(i));
+				BasicdataTeamStaffEntity entity = new BasicdataTeamStaffEntity();
+				BeanUtil.copyProperties(basicdataTeamStaff,entity);
+				entity.setStaffId(Long.valueOf(i));
+				entity.setName(userR.getData().getName());
+				list.add(entity);
+			});
+
+			return this.saveBatch(list);
+//		}
 
 	}
 

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionStockArticleClient.java

@@ -93,7 +93,7 @@ public class DistributionStockArticleClient implements IDistributionStockArticle
 	@Override
 	public DistributionStockArticleEntity findByOrderSelfNum(String waybillNo) {
     	QueryWrapper<DistributionStockArticleEntity> queryWrapper = new QueryWrapper<>();
-    	queryWrapper.eq("order_self_numbering",waybillNo);
+    	queryWrapper.eq("waybill_number",waybillNo);
 
 		return distributionStockArticleService.getOne(queryWrapper);
 	}

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/receiver/WaybillDataHandler.java

@@ -30,16 +30,20 @@ public class WaybillDataHandler {
 
 	@RabbitHandler
 	public void waybillDataHandler(Map map, Message message, Channel channel) {
-		 // 如果手动ACK,消息会被监听消费,但是消息在队列中依旧存在,如果 未配置 acknowledge-mode 默认是会在消费完毕后自动ACK掉
+		// 如果手动ACK,消息会被监听消费,但是消息在队列中依旧存在,如果 未配置 acknowledge-mode 默认是会在消费完毕后自动ACK掉
 		final long deliveryTag = message.getMessageProperties().getDeliveryTag();
 		String msg = new String(message.getBody());
 		WaybillDTO waybillDTO = (WaybillDTO) map.get("messageData");
-		log.info("##################waybillDataHandler: 处理开单零单数据 waybillDTO={}",waybillDTO);
+		log.info("##################waybillDataHandler: 处理开单零单数据 waybillDTO={}", waybillDTO);
 
-		if(!Objects.isNull(waybillDTO)) {
-			warehouseWaybillService.waybillDataHandler(waybillDTO);
-		}else {
-			log.info("##################waybillDataHandler: 处理开单零单数据 失败 WaybillNo={} ",waybillDTO.getWaybillNo());
+		if (!Objects.isNull(waybillDTO)) {
+			try {
+				warehouseWaybillService.waybillDataHandler(waybillDTO);
+			} catch (Exception e) {
+				log.error(e.getMessage());
+			}
+		} else {
+			log.info("##################waybillDataHandler: 处理开单零单数据 失败 WaybillNo={} ", waybillDTO.getWaybillNo());
 		}
 	}
 }

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java

@@ -87,12 +87,12 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl<WarehouseWaybil
 
 		WayBillEntity wayBillEntity = wayBillClient.getByWaybillId(wayBillId);
 
-		if(ObjectUtils.isNull(wayBillEntity)){
+		if (ObjectUtils.isNull(wayBillEntity)) {
 			log.warn("##############waybillDataHandler: 老系统中未找到对应运单waybillId={}", waybillDTO.getId());
 			throw new CustomerException("老系统中未找到对应运单");
 		}
 
-		String waybillNo =wayBillEntity.getWaybillNo();
+		String waybillNo = wayBillEntity.getWaybillNo();
 		//通过运单号先去查询新系统是否存在这个运单号
 		QueryWrapper<WarehouseWaybillEntity> waybillQueryWrapper = new QueryWrapper<>();
 		waybillQueryWrapper.eq("waybill_no", waybillNo);
@@ -114,7 +114,7 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl<WarehouseWaybil
 			for (WaybillDesEntity waybillDesEntity : des) {
 				WarehouseWayBillDetail warehouseWayBillDetail = new WarehouseWayBillDetail();
 				warehouseWayBillDetail.setWaybillId(waybillId);
-				warehouseWayBillDetail.setWaybillCode(waybillNo);
+				warehouseWayBillDetail.setWaybillNo(waybillNo);
 				warehouseWayBillDetail.setProductName(waybillDesEntity.getName());
 				warehouseWayBillDetail.setNum(waybillDesEntity.getNum());
 				warehouseWayBillDetail.setStatus(1);
@@ -123,8 +123,8 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl<WarehouseWaybil
 				warehouseWayBillDetail.setUpdateTime(date);
 				ls.add(warehouseWayBillDetail);
 			}
+
 			warehouseWayBillDetailService.addList(ls);
-			//创建在库订单
 			createStockArticle(warehouseWaybill);
 
 		} else {
@@ -343,6 +343,7 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl<WarehouseWaybil
 
 	/**
 	 * 插入运单
+	 *
 	 * @param wayBillEntity
 	 * @param allNum
 	 * @return