Merge branch 'dev' into pre-production

blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java

@@ -8,7 +8,7 @@ public interface ModuleNameConstant {
 	/**
 	 * 如果不需要 ""
 	 */
-	public static final String DEVAUTH ="";
+	public static final String DEVAUTH ="-pref";
 
 	/**
 	 * 工厂对接服务名称

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

@@ -1749,7 +1749,8 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 			DistributionBillLadingScanEntity distributionBillLadingScan = new DistributionBillLadingScanEntity();
 			distributionBillLadingScan.setMaterialType((String) type);
 			distributionBillLadingScan.setBillLadingId(Long.parseLong(billLadingId.toString()));
-			distributionBillLadingScan.setScanType(1); //扫描
+			distributionBillLadingScan.setScanType(1);
+			//扫描
 			if ("1".equals(type)) {
 				//库存品
 				DistrilbutionBillLadingInventoryAppVO inventoryAppVO = distributionDeliveryDetailsService.listCode(String.valueOf(billLadingId), String.valueOf(coding));
@@ -1878,16 +1879,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 			distributionAsyncService.getStockUPstate(Long.parseLong(a));
 
 
-			/*long count = list.stream().filter(e -> e.getConditions().equals("2")).count(); // 订 已签收的数
+
-			long count2 = list1.stream().filter(e -> e.getConditions().equals("2")).count(); // 库 已签收的数
-			if (Integer.parseInt(String.valueOf(count)) == list.size() && Integer.parseInt(String.valueOf(count2)) == list1.size()) {
-				//修改提货任务状态
-				DistrilbutionBillLadingEntity billLadingEntity = new DistrilbutionBillLadingEntity();
-				String bill = (String) billLadingId;
-				billLadingEntity.setId(Long.valueOf(bill));
-				billLadingEntity.setConditions("20");
-				baseMapper.updateById(billLadingEntity);
-			}*/
 			log.info(coding + " > > 签收成功!!");
 			return Resp.scanSuccess("签收成功", "");
 		}

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

@@ -270,8 +270,7 @@ public class ClassifyServiceImpl extends BaseServiceImpl<ClassifyMapper, Classif
 					//查询是否已经提交过考核
 					listId = Func.toLongList(deptId);
 				}
-				List<ClassifyEntity> entityList = this.list(ne
+				List<ClassifyEntity> entityList = this.list(ne);
-				);
 				for (ClassifyEntity entity : entityList) {
 					ClassifyVO classifyVO = ClassifyWrapper.build().entityVO(entity);
 					ClassifyApiVO classifyApiVO = Func.copy(classifyVO, ClassifyApiVO.class);
@@ -544,10 +543,21 @@ public class ClassifyServiceImpl extends BaseServiceImpl<ClassifyMapper, Classif
 	public R deptList() {
 		BladeUser user = AuthUtil.getUser();
 //		List<DeptVO> deptTree = deptClient.getDeptTree(user.getTenantId());
-		List<Dept> userDeptNode = deptClient.getUserDeptNode(Long.parseLong(user.getDeptId()));
+//		List<Dept> userDeptNode = deptClient.getUserDeptNode(Long.parseLong(user.getDeptId()));
-		return R.data(userDeptNode);
+
+
+		String[] split = user.getDeptId().split(",");
+
+		Set<Dept> tem= new HashSet<>();
+		for (String id:split){
+
+			List<Dept> userDeptNode = deptClient.getUserDeptNode(Long.parseLong(id));
+			tem.addAll(userDeptNode);
+		}
+		return R.data(tem);
 	}
 
+
 	@Transactional(rollbackFor = Exception.class)
 	@Override
 	public R importClassify(MultipartFile file) throws IOException {

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseGoodsAllocationMapper.xml

@@ -435,9 +435,9 @@
     <select id="selectAllocationNumInfo" resultType="com.logpm.warehouse.vo.locationsnubVO">
         SELECT
         (SELECT count(*) FROM logpm_warehouse_goods_allocation
-        where
+        where  is_deleted = 0
         <if test="warehouseId != null and warehouseId != ''">
-             warehouse_id = #{warehouseId}
+             and warehouse_id = #{warehouseId}
         </if>
         <if test="areaId != null and areaId != ''">
             and goods_area_id = #{areaId}
@@ -446,7 +446,7 @@
             and goods_shelf_id = #{shelfId}
         </if>
         )  AS cargoNub ,
-        (SELECT count(*) FROM logpm_warehouse_goods_allocation WHERE enable_status = '2'
+        (SELECT count(*) FROM logpm_warehouse_goods_allocation WHERE enable_status = '2' and is_deleted = 0
         <if test="warehouseId != null and warehouseId != ''">
             and warehouse_id = #{warehouseId}
         </if>
@@ -457,7 +457,7 @@
             and goods_shelf_id = #{shelfId}
         </if>
         )  AS disableNub,
-        (SELECT count(*) FROM logpm_warehouse_goods_allocation WHERE allocation_status = '2'
+        (SELECT count(*) FROM logpm_warehouse_goods_allocation WHERE allocation_status = '2' and enable_status = '1' and is_deleted = 0
         <if test="warehouseId != null and warehouseId != ''">
             and warehouse_id = #{warehouseId}
         </if>
@@ -468,7 +468,7 @@
             and goods_shelf_id = #{shelfId}
         </if>
         )  AS  employNub,
-        (SELECT count(*) FROM logpm_warehouse_goods_allocation WHERE allocation_status = '1'
+        (SELECT count(*) FROM logpm_warehouse_goods_allocation WHERE allocation_status = '1' and enable_status = '1' and is_deleted = 0
         <if test="warehouseId != null and warehouseId != ''">
             and warehouse_id = #{warehouseId}
         </if>