Merge branch 'dev' into pre-production

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesWorkOrderController.java

@@ -114,7 +114,7 @@ public class AftersalesWorkOrderController extends BladeController {
 
 
 	/**
-	 * 客服异常工单 完结处理熟练
+	 * 客服异常工单 完结处理
 	 */
 	@PostMapping("/addCompletionEnd")
 	@ApiOperationSupport(order = 4)

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

@@ -308,9 +308,10 @@
         ldslNew.tray_name AS trayName,
         ldslNew.unpack AS unpack,
         ldslNew.source_type AS sourceType,
-        count(ldss.id) AS realNum,
+<!--        count(ldss.id) AS realNum,-->
+        (SELECT count(*) FROM logpm_distribution_stock AS lds WHERE lds.stock_list_id = t.id AND lds.is_deleted = 0) AS realNum,
 <!--        t.deliveryDetailsId AS deliveryDetailsId,-->
-        t.reservation_num as planNum,
+        t.reservationNum as planNum,
         (
         select GROUP_CONCAT( DISTINCT (allocation_id)) from logpm_warehouse_updown_goods where association_value =ldslNew.cargo_number or association_value in (
         SELECT order_package_code from logpm_distribution_parcel_list where conditions=2 and material_code=ldslNew.cargo_number)
@@ -322,7 +323,7 @@
         ldsl.description_goods,
         ldsl.id,
         ldrs.id as deliveryDetailsId,
-        ldrs.reservation_num
+        SUM(ldrs.reservation_num) AS reservationNum
         FROM
         logpm_distribution_reservation_stocklist ldrs
         LEFT JOIN logpm_distribution_stock_list ldsl ON ldrs.stocklist_id = ldsl.id

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

@@ -389,7 +389,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 				//更新签收人
 				Integer m = distributionSignforMapper.updateSignUser(distributionLoadscanEntity.getDeliveryId(), distributionLoadscanEntity.getReservationId(),AuthUtil.getUser());
 				//扣减订单的在库数量
-				Integer k = distributionStockArticleMapper.deductionHandQuantity(loadscanEntity.getOrderId(), loadscanEntity.getLoadedNub());
+				Integer k = distributionStockArticleMapper.deductionHandQuantity(distributionLoadscanEntity.getOrderId(), distributionLoadscanEntity.getLoadedNub());
 				warehouseUpdownTypeClient.downPackageOrDelTray(collect.get(0).getOrderPackageCode(), myCurrentWarehouse.getId());
 				distributionAsyncService.checkSignStatus(distributionLoadscanEntity.getPackageId(),distributionLoadscanEntity.getReservationId(),distributionLoadscanEntity.getDeliveryId());
 			}

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/wrapper/DistributionDisStockListWrapper.java

@@ -26,7 +26,7 @@ public class DistributionDisStockListWrapper extends BaseEntityWrapper<DisStockL
 	public DisStockListDetailVO entityVO(DisStockListDetailEntity entity) {
 		DisStockListDetailVO disStockListDetailVO = Objects.requireNonNull(BeanUtil.copy(entity, DisStockListDetailVO.class));
 		disStockListDetailVO.setLoadingStatusName(DictBizCache.getValue(DictBizConstant.ORDER_PACKAGE_LOADING_STATUS, entity.getStockLockingStatus()));
-		disStockListDetailVO.setSigningStatusName(DictBizCache.getValue(DictBizConstant.ORDER_PACKAGE_STOCKUP_STATUS, entity.getStockLockingStatus()));
+//		disStockListDetailVO.setSigningStatusName(DictBizCache.getValue(DictBizConstant.OPS, entity.getStockSignfoStatus()));
 		return disStockListDetailVO;
 	}
 }

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/TaskQuestController.java

@@ -31,6 +31,7 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
 import javax.validation.Valid;
 
+import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
@@ -63,6 +64,7 @@ import javax.servlet.http.HttpServletResponse;
 @AllArgsConstructor
 @RequestMapping("blade-taskQuest/taskQuest")
 @Api(value = "盘点任务", tags = "盘点任务接口")
+@Slf4j
 public class TaskQuestController extends BladeController {
 
 	private final ITaskQuestService taskQuestService;
@@ -79,6 +81,19 @@ public class TaskQuestController extends BladeController {
 	}
 
 
+	/**
+	 * 盘点任务 到时间結束盘点任务
+	 */
+	@GetMapping("/finishTask")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入taskQuest")
+	public void finishTask() {
+		log.info("查询盘点任务！！");
+		 taskQuestService.getFinishTask();
+
+	}
+
+
 
 	/**
 	 * 盘点任务 任务下的包条
@@ -250,7 +265,7 @@ public class TaskQuestController extends BladeController {
 	}
 
 	/**
-	 * 盘点任务 修改
+	 * 盘点任务 实体 修改
 	 */
 	@PostMapping("/updateInfo")
 	@ApiOperationSupport(order = 5)

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/ITaskQuestService.java

@@ -269,4 +269,10 @@ public interface ITaskQuestService extends BaseService<TaskQuestEntity> {
 	 * @return
 	 */
 	List<QuestContrastExcel> exportGetContrastInfo(QuestDetailDTO questDetailDTO);
+
+	/**
+	 * 查询盘点任务是否结束
+	 * @param id
+	 */
+	void getFinishTask();
 }

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

@@ -63,6 +63,7 @@ import org.springblade.system.feign.IUserSearchClient;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -1357,6 +1358,35 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 
 	}
 
+	/**
+	 * 查询盘点数据到时间就结束
+	 *
+	 */
+	@Override
+	public void getFinishTask() {
+		QueryWrapper<TaskQuestEntity> queryWrapper = new QueryWrapper<>();
+		List<TaskQuestEntity> taskQuestEntities = baseMapper.selectList(queryWrapper);
+		taskQuestEntities.forEach( i ->{
+			SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+			try {
+				long l = format.parse(i.getEndTime()).getTime() / 1000;
+				long l1 = new Date().getTime() / 1000;
+				if(l < l1){
+					//结束当前任务
+					TaskQuestEntity taskQuestEntity = new TaskQuestEntity();
+					taskQuestEntity.setId(i.getId());
+					taskQuestEntity.setQuestStatus(String.valueOf(3));
+					baseMapper.updateById(taskQuestEntity);
+				}
+			} catch (ParseException e) {
+				throw new RuntimeException(e);
+			}
+
+
+
+		});
+	}
+
 	/**
 	 * 查询货位上的数据
 	 * @param taskSearchDTO