Merge branch 'dev' into pre-production

blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/ClassifyExportVO.java

@@ -19,34 +19,34 @@ public class ClassifyExportVO implements Serializable {
 	@ExcelIgnore
 	private Long createDept;
 
-	@ExcelProperty(value = "创建时间")
+	@ExcelProperty(value = "创建时间",index = 7)
 	private Date createTime;
 
 	@ExcelIgnore
 	private Long updateUser;
 
-	@ExcelProperty(value = "指标名称")
+	@ExcelProperty(value = "指标名称",index = 1)
 	private String name;
 
-	@ExcelProperty(value = "指标描述")
+	@ExcelProperty(value = "指标描述",index = 2)
 	private String description;
 
-	@ExcelProperty(value = "指标备注")
+	@ExcelProperty(value = "指标备注",index = 3)
 	private String remark;
 
 	@ExcelIgnore
 	private Long pId;
 
-	@ExcelProperty(value = "考核范围")
+	@ExcelProperty(value = "考核范围",index = 4)
 	private String examineDeptName;
 
-	@ExcelProperty(value = "指标分类")
+	@ExcelProperty(value = "指标分类",index = 0)
 	private String parentClassifyName;
 
-	@ExcelProperty(value = "考核归属部门")
+	@ExcelProperty(value = "考核归属部门",index = 5)
 	private String createDeptName;
 
-	@ExcelProperty(value = "考核分值")
+	@ExcelProperty(value = "考核分值" ,index = 6)
 	private String pointStr;
 
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml

@@ -832,7 +832,7 @@
         ldpl.material_name AS descriptionGoods,
         ldpl.order_package_status AS orderPackageStatus,
         ldpl.conditions,
-        lwtg.pallet_name AS trayCode,
+        lwt.pallet_name AS trayCode,
         lwug.position_code AS positionCode ,
         ldsa.mall_name as marketName
         from

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml

@@ -1227,7 +1227,7 @@
         logpm_distribution_reservation AS ldr
         LEFT JOIN logpm_distribution_reservation_package AS ldrp ON ldr.id = ldrp.reservation_id
         LEFT JOIN logpm_distribution_parcel_list AS ldpl ON ldrp.parce_list_id = ldpl.id
-        LEFT JOIN logpm_distribution_loadscan AS ldl ON ldl.package_id = ldpl.id AND ldl.is_abnormal_loading = 1 AND ldl.scan_status != 1
+        LEFT JOIN logpm_distribution_loadscan AS ldl ON ldl.package_id = ldpl.id AND ldl.is_abnormal_loading = 1 AND ldl.scan_status != 1 AND ldl.reservation_id = ldr.id
         WHERE
         ldrp.packet_bar_status != 2
         AND ldr.id = #{reservationId}

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

@@ -373,8 +373,6 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 					if (Func.isNotEmpty(s.getStockupArea())) {
 						goodsArea.add(s.getStockupArea());
 					}
-
-
 				});
 				DistributionStockupVO distributionStockupVO = new DistributionStockupVO();
 				distributionStockupVO.setForkliftName(String.join(",", forkliftName));
@@ -383,8 +381,10 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 //				distributionStockupVO.setOutboundDate(outboundDate);
 				distributionDeliveryListVO.setStockupInfo(distributionStockupVO);
 
-			} else {
+			} else if (distributionStockupVOList.size() == 1){
 				distributionDeliveryListVO.setStockupInfo(distributionStockupVOList.get(0));
+			}else {
+				log.info("查询无备货信息");
 			}
 		} else {
 			DistributionStockupVO deliveryStockupInfo = distributionStockupMapper.getDeliveryStockupInfo(detail.getId());

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

@@ -255,6 +255,10 @@ public class DistributionStockListServiceImpl extends BaseServiceImpl<Distributi
 			);
 
 		}
+		if (list.get(0).getCargoNumber().equals(distributionStockListDTO.getCargoNumber())){
+			log.error("库存品拆包选择目标物料一致:{}",distributionStockListDTO.getCargoNumber());
+			return false;
+		}
 		//没有新增
 		DistributionStockListEntity distributionStockListEntity = new DistributionStockListEntity();
 		BeanUtils.copyProperties(list.get(0),distributionStockListEntity);

blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java

@@ -128,12 +128,15 @@ public class ClassifyServiceImpl extends BaseServiceImpl<ClassifyMapper, Classif
 			String deptName = deptClient.findNameById(deptId);
 			record.setCreateDeptName(deptName);
 
+			record.setIsEdit(0);
 			String ancestors = deptClient.getAncestorsByDeptId(deptId);
-			boolean contains = ancestors.contains(loginDeptId);
-			if(contains){
-				record.setIsEdit(1);
-			}else{
-				record.setIsEdit(0);
+			if(!StringUtil.isBlank(ancestors)){
+				boolean contains = ancestors.contains(loginDeptId);
+				if(contains){
+					record.setIsEdit(1);
+				}else{
+					record.setIsEdit(0);
+				}
 			}
 
 			if (!"1".equals(isPid)) {