Merge branch 'dev' into pre-production

blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/AdvanceDTO.java

@@ -33,4 +33,6 @@ public class AdvanceDTO implements Serializable {
 	private String serviceNum;
 	private String brand;
 
+	private Integer hasPackage;
+
 }

blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineAdvanceEntity.java

@@ -134,5 +134,7 @@ public class TrunklineAdvanceEntity extends TenantEntity {
 	@ApiModelProperty(name = "商场收货地址",notes = "")
 	private String consigneeAddress;
 
+	@ApiModelProperty(name = "是否有包件",notes = "")
+	private Integer hasPackage = 1;
 
 }

blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsMapper.xml

@@ -5,7 +5,9 @@
     <select id="pageList" resultType="com.logpm.supervise.vo.IndicatorsVO">
 
         select si.id id,
+               sc.id classifyId,
                sc.name classifyName,
+               psc.id parentClassifyId,
                psc.name parentClassifyName,
                psc.id parentClassifyId,
                si.assess_dept_name assessDeptName,

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/OpenOrderController.java

@@ -45,6 +45,7 @@ public class OpenOrderController {
 		Integer pageNum = advanceDTO.getPageNum();
 		Integer pageSize = advanceDTO.getPageSize();
 		String freezeStatus = advanceDTO.getFreezeStatus();
+		Integer hasPackage = advanceDTO.getHasPackage();
 		try{
 
 			//当前登录人选择的仓库
@@ -63,6 +64,11 @@ public class OpenOrderController {
 				log.warn(method+"冻结状态不能为空 freezeStatus={}",freezeStatus);
 				return R.fail(400,"冻结状态不能为空");
 			}
+			if(Objects.isNull(hasPackage)){
+				log.warn(method+"有无包件数据不能为空 hasPackage={}",hasPackage);
+				return R.fail(400,"有无包件数据不能为空");
+			}
+
 
 			IPage<TrunklineAdvanceVO> pages = openOrderService.advancePageList(advanceDTO);
 
@@ -916,6 +922,34 @@ public class OpenOrderController {
 		}
 	}
 
+	@ResponseBody
+	@PostMapping("/importOrderNoPackage")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "导入无包件的订单信息", notes = "传入openOrderDTO")
+	public R importOrderNoPackage(@RequestParam(value = "file") MultipartFile file) {
+		String method = "############importOrderNoPackage: ";
+		log.info(method + "请求参数{}", file);
+		try{
+
+			//当前登录人选择的仓库
+			BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
+			if(Objects.isNull(myCurrentWarehouse)){
+				log.warn(method+"仓库信息为空 myCurrentWarehouse={}",myCurrentWarehouse);
+				return R.fail(403,"仓库信息为空");
+			}
+
+			return openOrderService.importOrderNoPackage(myCurrentWarehouse.getId(),myCurrentWarehouse.getName(),file);
+		}catch (CustomerException e){
+			log.error(e.message,e);
+			return R.fail(e.code,e.message);
+		}catch (Exception e){
+			log.error(method+"系统异常",e);
+			return R.fail(500,"系统异常");
+		}
+	}
+
+
+
 
 	@ResponseBody
 	@PostMapping("/importCustomizedOuPai")

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.java

@@ -35,4 +35,5 @@ public interface TrunklineAdvanceDetailMapper extends BaseMapper<TrunklineAdvanc
     TrunklineAdvanceDetailEntity findEntityByOrderPackageCodelimit1(@Param("orderPackageCode") String orderPackageCode);
 
 	List<String> findOrderPackageCodesByAdvanceId(@Param("advanceId") Long advanceId);
+
 }

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.xml

@@ -35,7 +35,7 @@
     <select id="findGoodsListByAdvanceIds" resultType="com.logpm.trunkline.vo.AdvanceDetailGoodsVO">
         select ltad.first_pack_name goodsName,
                ltad.charge_type chargeType,
-               count(ltad.id) num,
+               sum(ltad.quantity) num,
                 sum(ltad.weight) weight,
                 sum(ltad.volume) volume
         from logpm_trunkline_advance_detail ltad

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceMapper.xml

@@ -20,6 +20,9 @@
           <if test="param.warehouseId != null">
               and lta.warehouse_id = #{param.warehouseId}
           </if>
+        <if test="param.hasPackage != null">
+            and lta.has_package = #{param.hasPackage}
+        </if>
         <if test="param.orderCode != null and param.orderCode != ''">
             and lta.order_code like concat('%',${param.orderCode},'%')
         </if>

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/IOpenOrderService.java

@@ -61,6 +61,7 @@ public interface IOpenOrderService {
 
 	R findPayWayByClientId(Long clientId);
 
+	R importOrderNoPackage(Long warehouseId, String warehouseName, MultipartFile file) throws IOException;
 
 
 //	R findWaybillInfo(String waybillNo);

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineAdvanceDetailService.java

@@ -42,4 +42,7 @@ public interface ITrunklineAdvanceDetailService extends BaseService<TrunklineAdv
 	List<TrunklineAdvanceDetailEntity> findListByAdvanceId(Long advanceId);
 
 	List<String> findOrderPackageCodesByAdvanceId(Long advanceId);
+
+    void deleteByAdvanceId(Long advanceId);
+
 }

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java

@@ -714,11 +714,10 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 	public void deletedAdvance(AdvanceDTO advanceDTO) {
 		List<Long> advanceIds = advanceDTO.getAdvanceIds();
 
-		List<TrunklineAdvanceEntity> listByIds = advanceService.findListByIds(advanceIds);
-		for (TrunklineAdvanceEntity advanceEntity:listByIds){
-			advanceEntity.setIsDeleted(1);
+		for (Long advanceId:advanceIds){
+			advanceDetailService.deleteByAdvanceId(advanceId);
 		}
-		advanceService.updateBatchById(listByIds);
+		advanceService.deleteLogic(advanceIds);
 	}
 
 	@Override
@@ -917,7 +916,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 				advanceEntity.setArea(pacakgeDetailExcelDTO.getArea());
 				advanceEntity.setOrderType("Label");
 				advanceEntity.setBrand(pacakgeDetailExcelDTO.getBrand());
-				advanceEntity.setTotalNum(0);
+				advanceEntity.setTotalNum(detailExcelDTOS.size());
 				String firsts = pacakgeDetailExcelDTO.getFirsts();
 				advanceEntity.setPackName(firsts);
 				advanceEntity.setDealerCode(pacakgeDetailExcelDTO.getDealerCode());
@@ -1442,6 +1441,92 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 		return R.data(map);
 	}
 
+	@Override
+	public R importOrderNoPackage(Long warehouseId, String warehouseName, MultipartFile file) throws IOException {
+		if(Objects.isNull(file)){
+			log.warn("##################importOrderNoPackage: 文件不存在");
+			return R.fail(405,"文件不存在");
+		}
+		InputStream inputStream = file.getInputStream();
+
+		List<OrderNoPackageExcelDTO> orderNoPackageExcelDTOS  = EasyExcel.read(inputStream).head(OrderNoPackageExcelDTO.class).sheet(0).headRowNumber(2).doReadSync();
+		Map<String, List<OrderNoPackageExcelDTO>> listMap = orderNoPackageExcelDTOS.parallelStream().collect(Collectors.groupingBy(a -> a.getOrderCode() + "&" + a.getTrainNumber()));
+
+		listMap.remove("null&null");
+
+		Set<String> set = listMap.keySet();
+
+		for (String str : set) {
+			String[] split = str.split("&");
+			String orderCode = split[0];
+			String trainNumber = split[1];
+			List<OrderNoPackageExcelDTO> noPackageExcelDTOList = listMap.get(str);
+			OrderNoPackageExcelDTO orderNoPackageExcelDTO = noPackageExcelDTOList.get(0);
+			TrunklineAdvanceEntity trunklineAdvanceEntity = advanceService.findEntityByOrderCodeAndTrainNumber(orderCode, trainNumber);
+			if(Objects.isNull(trunklineAdvanceEntity)){
+				trunklineAdvanceEntity = new TrunklineAdvanceVO();
+				trunklineAdvanceEntity.setWarehouseId(warehouseId);
+				trunklineAdvanceEntity.setWarehouseName(warehouseName);
+				trunklineAdvanceEntity.setOrderCode(orderCode);
+				trunklineAdvanceEntity.setBrand(orderNoPackageExcelDTO.getBrand());
+				trunklineAdvanceEntity.setTotalNum(Integer.parseInt(orderNoPackageExcelDTO.getNum()));
+				trunklineAdvanceEntity.setPackName(orderNoPackageExcelDTO.getFirsts());
+				trunklineAdvanceEntity.setDealerName(orderNoPackageExcelDTO.getDealerName());
+				trunklineAdvanceEntity.setCustomerName(orderNoPackageExcelDTO.getCustomerName());
+				trunklineAdvanceEntity.setCustomerPhone(orderNoPackageExcelDTO.getCustomerPhone());
+				trunklineAdvanceEntity.setCustomerAddress(orderNoPackageExcelDTO.getCustomerAddress());
+				trunklineAdvanceEntity.setConsigneePerson(orderNoPackageExcelDTO.getConsigneePerson());
+				trunklineAdvanceEntity.setConsigneeMobile(orderNoPackageExcelDTO.getConsigneeMobile());
+				trunklineAdvanceEntity.setConsigneeAddress(orderNoPackageExcelDTO.getConsigneeAddress());
+				trunklineAdvanceEntity.setSystemType("线上");
+				trunklineAdvanceEntity.setMatingType("1");
+				trunklineAdvanceEntity.setWaybillStatus("0");
+				trunklineAdvanceEntity.setTrainNumber(orderNoPackageExcelDTO.getTrainNumber());
+				trunklineAdvanceEntity.setFreezeStatus("0");
+				trunklineAdvanceEntity.setLegacyStatus("0");
+				trunklineAdvanceEntity.setHasPackage(0);
+				advanceService.save(trunklineAdvanceEntity);
+			}
+
+			List<TrunklineAdvanceDetailEntity> advanceDetailEntities = new ArrayList<>();
+			for (OrderNoPackageExcelDTO noPackageExcelDTO : orderNoPackageExcelDTOS) {
+
+				TrunklineAdvanceDetailEntity advanceDetailModel = new TrunklineAdvanceDetailEntity();
+				advanceDetailModel.setWarehouseId(warehouseId);
+				advanceDetailModel.setWarehouseName(warehouseName);
+				advanceDetailModel.setAdvanceId(trunklineAdvanceEntity.getId());
+				advanceDetailModel.setOrderCode(orderCode);
+				advanceDetailModel.setBrand(noPackageExcelDTO.getBrand());
+				advanceDetailModel.setSystemType("线上");
+
+				advanceDetailModel.setFirstPackName(noPackageExcelDTO.getFirsts());
+				String sencods = noPackageExcelDTO.getSencods();
+				if(StringUtil.isBlank(sencods)){
+					advanceDetailModel.setSecondPackName(noPackageExcelDTO.getFirsts());
+				}else{
+					advanceDetailModel.setSecondPackName(sencods);
+				}
+				String thirds = noPackageExcelDTO.getThirds();
+				if(StringUtil.isBlank(thirds)){
+					advanceDetailModel.setThirdPackName(noPackageExcelDTO.getFirsts());
+				}else{
+					advanceDetailModel.setThirdPackName(thirds);
+				}
+				advanceDetailModel.setQuantity(Integer.parseInt(noPackageExcelDTO.getNum()));
+				advanceDetailModel.setServiceNum(noPackageExcelDTO.getServiceNum());
+				advanceDetailModel.setPackageStatus("0");
+				advanceDetailModel.setFirstPackName(noPackageExcelDTO.getFirsts());
+				advanceDetailModel.setSecondPackName(noPackageExcelDTO.getSencods());
+				advanceDetailModel.setThirdPackName(noPackageExcelDTO.getThirds());
+				advanceDetailEntities.add(advanceDetailModel);
+			}
+			advanceDetailService.saveBatch(advanceDetailEntities);
+
+		}
+
+		return R.success("导入成功");
+	}
+
 	private String verifyData(OpenOrderDTO openOrderDTO, WarehouseWaybillEntity waybillEntity) {
 		log.info("###################verifyData: 验证改单数据");
 		StringBuilder stringBuilder = new StringBuilder();

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceDetailServiceImpl.java

@@ -185,4 +185,12 @@ public class TrunklineAdvanceDetailServiceImpl extends BaseServiceImpl<Trunkline
 	public List<String> findOrderPackageCodesByAdvanceId(Long advanceId) {
 		return baseMapper.findOrderPackageCodesByAdvanceId(advanceId);
 	}
+
+	@Override
+	public void deleteByAdvanceId(Long advanceId) {
+		QueryWrapper<TrunklineAdvanceDetailEntity> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("advance_id",advanceId)
+			.eq("is_deleted",0);
+		baseMapper.delete(queryWrapper);
+	}
 }