Merge remote-tracking branch 'origin/dev' into dev

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

@@ -89,4 +89,11 @@ public interface IDistributionParcelListClient {
 	Integer SumEntityByOrderId(@RequestParam Long orderId,@RequestParam Long warehouseId);
 
 
+	/**
+	 * 查询订单下所有包件信息
+	 * @param id
+	 * @return
+	 */
+	@GetMapping(API_PREFIX+"/getParcelListByStockArticleId")
+	List<DistributionParcelListEntity> getParcelListByStockArticleId(@RequestParam Long id);
 }

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

@@ -98,7 +98,7 @@ public interface IDistributionStockArticleClient {
 	DistributionStockArticleEntity findZeroByOrderCodeAndWarehouseId(@RequestParam String orderCode, @RequestParam Long warehouseId);
 
 
-	@GetMapping(API_PREFIX + "/findStockArticleByCodeAndMarket")
+	@GetMapping(API_PREFIX + "/findStockArticleByCodeAndMarketAndWarehouseId")
-	DistributionStockArticleEntity findStockArticleByCodeAndMarketAndWarehouseId(@RequestParam String orderCode,@RequestParam List<String> marketNames,@RequestParam Long warehosueId);
+	List<DistributionStockArticleEntity> findStockArticleByCodeAndMarketAndWarehouseId(@RequestParam String incomingBatch,@RequestParam String marketNames,@RequestParam Long warehouseId);
 
 }

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionPackadeliVO.java

@@ -32,4 +32,6 @@ public class DistributionPackadeliVO extends DistributionPackadeliEntity {
 	private static final long serialVersionUID = 1L;
 
 
+
+
 }

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

@@ -170,6 +170,11 @@ public class QuestDetailEntity extends TenantEntity {
 	 */
 	private String materialCode;
 
+	/**
+	 * 物料名称
+	 */
+	private String materialName;
+
 	/**
 	 * 商场名称
 	 */

blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/TaskContractVO.java

@@ -3,6 +3,8 @@ package com.logpm.warehouse.vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class TaskContractVO {
 
@@ -18,7 +20,6 @@ public class TaskContractVO {
 	@ApiModelProperty(value = "订单号")
 	private Long orderId;
 
-
 	/**
 	 * 总件数
 	 */
@@ -36,4 +37,23 @@ public class TaskContractVO {
 	 */
 	@ApiModelProperty(value = "盘点件数")
 	private Integer unTotal;
+
+
+	/**
+	 * 是否是零担 0- 否  1-是
+	 */
+	@ApiModelProperty(value = "是否是零担 0- 否  1-是")
+	private Integer isZero;
+
+	/**
+	 * 是否是库存品 0- 否  1-是
+	 */
+	@ApiModelProperty(value = "是否是库存品 0- 否  1-是")
+	private Integer isInventory;
+
+	/**
+	 * 包件列表
+	 */
+	@ApiModelProperty(value = "包件列表")
+	List<TaskPackagelistVO> packagelistVOList;
 }

blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/TaskPackagelistVO.java

@@ -0,0 +1,65 @@
+package com.logpm.warehouse.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class TaskPackagelistVO {
+
+	/**
+	 * 订单自编号
+	 */
+	@ApiModelProperty(value = "订单自编号")
+	private String orderCode;
+
+	/**
+	 * 包条码
+	 */
+	@ApiModelProperty(value = "订单自编号")
+	private String orderPackageCode;
+
+	/**
+	 * 包条码
+	 */
+	@ApiModelProperty(value = "订单自编号")
+	private String waybillNub;
+
+	/**
+	 * 库位信息
+	 */
+	@ApiModelProperty(value = "订单自编号")
+	private String allocation;
+
+	/**
+	 * 当前状态  只能是在库
+	 */
+	@ApiModelProperty(value = "当前状态  只能是在库")
+	private String currentStatus;
+
+	/**
+	 * 订单号
+	 */
+	@ApiModelProperty(value = "订单号")
+	private Long orderId;
+
+	/**
+	 * 数量
+	 */
+	@ApiModelProperty(value = "数量")
+	private Integer quantity;
+
+	/**
+	 * 数量
+	 */
+	@ApiModelProperty(value = "物料名称")
+	private String materialName;
+
+	/**
+	 * 物料编码
+	 */
+	@ApiModelProperty(value = "物料编码")
+	private String materialCode;
+
+
+
+}

blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/TaskStripApiVO.java

@@ -79,6 +79,7 @@ public class TaskStripApiVO {
 
 
 	private String materialCode;
+
 	private String materialName;
 
 	private String waybillNo;

blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/TaskTrayVO.java

@@ -56,4 +56,6 @@ public class TaskTrayVO {
 	 */
 	private List<QuestDetailVO>  list;
 
+
+
 }

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

@@ -151,4 +151,10 @@ public class DistributionParcelListClient implements IDistributionParcelListClie
 		Integer i =	distributionParcelListService.selectSumByOrderId(orderId,warehouseId);
 		return i;
 	}
+
+	@Override
+	public List<DistributionParcelListEntity> getParcelListByStockArticleId(Long id) {
+
+		return distributionParcelListService.getParcelListByStockArticleId(id);
+	}
 }

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

@@ -177,8 +177,8 @@ public class DistributionStockArticleClient implements IDistributionStockArticle
 
 
 	@Override
-	public DistributionStockArticleEntity findStockArticleByCodeAndMarketAndWarehouseId(String code, List<String> marketNames,Long warehouseId) {
+	public List<DistributionStockArticleEntity> findStockArticleByCodeAndMarketAndWarehouseId(String incomingBatch, String marketNames,Long warehouseId) {
-		return distributionStockArticleService.findStockArticleByCodeAndMarketAndWarehouseId(code,marketNames,warehouseId);
+		return distributionStockArticleService.findStockArticleByCodeAndMarketAndWarehouseId(incomingBatch,marketNames,warehouseId);
 	}
 
 }

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

@@ -163,7 +163,7 @@ public class DistributionStockListClient implements IDistributionStockListClient
 	public List<DistributionStockListEntity> getStockListByWarehouseIdAndMarketAndStockListInfo(String incomingBatch, List<String> marketNames, Long warehouseId) {
 		LambdaQueryWrapper<DistributionStockListEntity> stockListEntityLambdaQueryWrapper = Wrappers.<DistributionStockListEntity>query().lambda();
 		if (Func.isNotEmpty(incomingBatch)){
-			stockListEntityLambdaQueryWrapper.like(DistributionStockListEntity::getIncomingBatch,incomingBatch).or().like(DistributionStockListEntity::getMarketName,incomingBatch);
+			stockListEntityLambdaQueryWrapper.eq(DistributionStockListEntity::getIncomingBatch,incomingBatch).or().eq(DistributionStockListEntity::getMarketCode,incomingBatch);
 		}
 		if (Func.isNotEmpty(marketNames)){
 			stockListEntityLambdaQueryWrapper.in(DistributionStockListEntity::getMarketName,marketNames);
@@ -173,5 +173,4 @@ public class DistributionStockListClient implements IDistributionStockListClient
 		return distributionStockListService.list(stockListEntityLambdaQueryWrapper);
 	}
 
-
 }

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

@@ -317,7 +317,7 @@
     </select>
     <select id="pageListOwe" parameterType="com.logpm.distribution.dto.DistributionStockArticleOweDTO"
             resultType="com.logpm.distribution.entity.DistributionStockArticleEntity">
-        select DISTINCT ldsa.id, ldsa.tenant_id,
+        select ldsa.id, ldsa.tenant_id,
         ldsa.create_user,
         ldsa.create_time,
         ldsa.update_user,

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionParcelListService.java

@@ -132,4 +132,11 @@ public interface IDistributionParcelListService extends BaseService<Distribution
 	int getZeroUpdateMaterial(Map<String, Object> distributionParcelList);
 
     Integer selectSumByOrderId(Long orderId, Long warehouseId);
+
+	/**
+	 * 查询订单下所有包件信息
+	 * @param id
+	 * @return
+	 */
+	List<DistributionParcelListEntity> getParcelListByStockArticleId(Long id);
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockArticleService.java

@@ -180,5 +180,5 @@ public interface IDistributionStockArticleService extends BaseService<Distributi
 	 * @param marketNames
 	 * @return
 	 */
-    DistributionStockArticleEntity findStockArticleByCodeAndMarketAndWarehouseId(String code, List<String> marketNames,Long warehouseId);
+	List<DistributionStockArticleEntity> findStockArticleByCodeAndMarketAndWarehouseId(String code, String marketNames,Long warehouseId);
 }

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

@@ -481,6 +481,10 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 				loadscanEntity.setIsAbnormalLoading(1);
 				//出库
 				warehouseUpdownTypeClient.downPackage(distrilbutionloadingscanDTO.getBarcode(), myCurrentWarehouse.getId());
+				//订单扣减在库数量
+				DistributionStockArticleEntity stockArticleEntity = distributionStockArticleService.getById(parcelListEntity.getStockArticleId());
+				stockArticleEntity.setHandQuantity(stockArticleEntity.getHandQuantity() - parcelListEntity.getQuantity());
+				distributionStockArticleService.updateById(stockArticleEntity);
 				distributionLoadscanService.save(loadscanEntity);
 				//查询本车次是否第一次扫码,没有则更新上车时间
 				Integer i = distributionDeliveryListMapper.updateloadingTimeById(distrilbutionloadingscanDTO.getDeliveryId());
@@ -489,7 +493,6 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 				//这里还需要一个维护状态的方法
 				//异步维护状态
 				distributionAsyncService.checkLoadingByPackage(parcelListEntity, distrilbutionloadingscanDTO.getDeliveryId());
-
 			} else if (parcelListEntityList.size() == 0) {
 				//查找出该包件信息
 				DistributionParcelListEntity parcelListEntity = distributionParcelListService.getOne(Wrappers.<DistributionParcelListEntity>query().lambda()

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

@@ -349,6 +349,11 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 		return null;
 	}
 
+	@Override
+	public List<DistributionParcelListEntity> getParcelListByStockArticleId(Long id) {
+		return this.list(Wrappers.<DistributionParcelListEntity>query().lambda().eq(DistributionParcelListEntity::getStockArticleId,id));
+	}
+
 	/**
 	 *
 	 * @param distributionParcelList

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

@@ -46,6 +46,7 @@ import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.common.constant.DictBizConstant;
 import org.springblade.common.constant.common.IsOrNoConstant;
+import org.springblade.common.constant.order.OrderStatusConstant;
 import org.springblade.common.constant.orderpackage.OrderPackageGroundingStatusConstant;
 import org.springblade.common.constant.printTemplate.PrintTemplateStatusConstant;
 import org.springblade.common.utils.CommonUtil;
@@ -1083,18 +1084,22 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 	}
 
 	@Override
-	public DistributionStockArticleEntity findStockArticleByCodeAndMarketAndWarehouseId(String code, List<String> marketNames,Long warehouseId) {
+	public List<DistributionStockArticleEntity> findStockArticleByCodeAndMarketAndWarehouseId(String code, String marketNames,Long warehouseId) {
 		if (Func.isEmpty(warehouseId)){
 			return null;
 		}
-		LambdaQueryWrapper<DistributionStockArticleEntity> lambda = Wrappers.<DistributionStockArticleEntity>query().lambda().eq(DistributionStockArticleEntity::getAcceptWarehouseId,warehouseId);
+		ArrayList<String> str = new ArrayList<>();
+		str.add(OrderStatusConstant.qianshou.getValue());
+		str.add(OrderStatusConstant.chuku.getValue());
+		LambdaQueryWrapper<DistributionStockArticleEntity> lambda = Wrappers.<DistributionStockArticleEntity>query().lambda()
+			.eq(DistributionStockArticleEntity::getAcceptWarehouseId,warehouseId).notIn(DistributionStockArticleEntity::getOrderStatus,str);
 		if (Func.isNotEmpty(code)){
-			lambda.like(DistributionStockArticleEntity::getOrderCode,code);
+			lambda.eq(DistributionStockArticleEntity::getOrderCode,code);
 		}
-		if (Func.isNotEmpty(marketNames) && marketNames.size()>0){
+		if (Func.isNotEmpty(marketNames)){
-			lambda.in(DistributionStockArticleEntity::getMallName,code);
+			lambda.in(DistributionStockArticleEntity::getMallName,Func.toStrList(",",marketNames));
 		}
-		return this.getOne(lambda);
+		return this.list(lambda);
 	}
 
 

blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/FactoryAuthServiceImpl.java

@@ -51,7 +51,7 @@ public class FactoryAuthServiceImpl implements IFactoryAuthService {
 		String tokenAbst = MD5Utils.md5Hex(token.getBytes(StandardCharsets.UTF_8));
 		//过期时间生成
 		LocalDateTime start = LocalDateTime.now();
-		LocalDateTime end = start.plusMinutes(30);
+		LocalDateTime end = start.plusMinutes(60*24*30);
 		Date date = Date.from( end.atZone( ZoneId.systemDefault()).toInstant());
 
 		//查询是否有当前账户的token数据

blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncOrderInfoServiceImpl.java

@@ -572,13 +572,9 @@ public class SyncOrderInfoServiceImpl implements ISyncOrderInfoService {
 //					distributionStockArticleEntity.setWarehouse(t.getName());
 //					distributionStockArticleEntity.setWarehouseId(t.getId());
 				}
-			}
 
 				String customerName = wayBillEntity.getTakeCompany();//客户名称
 
-			//通过客户名称去查询客户的服务类型、
-			distributionStockArticleEntity.setTypeService("1");//默认商配
-
 				BasicdataClientEntity basicdataClientEntity = basicdataClientClient.findByName(customerName);
 				log.info("订单同步出现的客户编号{} 匹配的客户", basicdataClientEntity);
 				if (!Objects.isNull(basicdataClientEntity)) {
@@ -599,6 +595,33 @@ public class SyncOrderInfoServiceImpl implements ISyncOrderInfoService {
 						distributionStockArticleEntity.setTypeService(peisongType);
 					}
 				}
+			}
+
+
+
+			//通过客户名称去查询客户的服务类型、
+			distributionStockArticleEntity.setTypeService("1");//默认商配
+
+//			BasicdataClientEntity basicdataClientEntity = basicdataClientClient.findByName(customerName);
+//			log.info("订单同步出现的客户编号{} 匹配的客户", basicdataClientEntity);
+//			if (!Objects.isNull(basicdataClientEntity)) {
+//				//商城
+//				distributionStockArticleEntity.setMallId(basicdataClientEntity.getId());
+//				distributionStockArticleEntity.setMallName(basicdataClientEntity.getClientName());
+//				distributionStockArticleEntity.setMallCode(basicdataClientEntity.getClientCode());
+//
+//				distributionStockArticleEntity.setDealerCode(basicdataClientEntity.getClientCode());
+//				distributionStockArticleEntity.setDealerName(basicdataClientEntity.getClientName());
+//
+//
+//				// todo  这里需要去查询门店 和新系统的门店ID 进行绑定
+//				String peisongType = getPeisongTypeByClientId(basicdataClientEntity.getId());
+//				log.info("订单同步peisongType {} ", peisongType);
+//
+//				if (StringUtil.isNoneBlank(peisongType)) {
+//					distributionStockArticleEntity.setTypeService(peisongType);
+//				}
+//			}
 
 			distributionStockArticleEntity.setGenre(1);
 			distributionStockArticleEntity.setAdvanceId(advanceId);

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

@@ -74,7 +74,7 @@ public class WarehouseTaskApiController {
 	}
 
 	/**
-	 * 合同号列表
+	 * 合同号查询列表
 	 */
 	@GetMapping("/contractList")
 	@ApiOperationSupport(order = 1)
@@ -86,7 +86,20 @@ public class WarehouseTaskApiController {
 
 
 	/**
-	 * 合同号扫描
+	 * 合同号订单详情
+	 */
+	@GetMapping("/contractQuestDetail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "合同号列表", notes = "code,type")
+	public R contractQuestDetail(TaskSearchDTO taskSearchDTO) {
+		R r = taskQuestService.contractQuestDetail(taskSearchDTO);
+		return r;
+	}
+
+
+
+	/**
+	 * 合同号方式添加查询
 	 */
 	@PostMapping("/queryContract")
 	@ApiOperationSupport(order = 1)

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/TaskSearchDTO.java

@@ -57,6 +57,12 @@ public class TaskSearchDTO {
 	@ApiModelProperty(value = "type(1-手动输入,2-扫描)")
 	private Integer type;
 
+	/**
+	 * 是否库存品
+	 */
+	@ApiModelProperty(value = "0 否 1是")
+	private Integer isInventory;
+
 	/**
 	 * goodsType 合同号类型
 	 */
@@ -75,10 +81,19 @@ public class TaskSearchDTO {
 	@ApiModelProperty(value = "列表存在订单ID")
 	private String stockArticleIds;
 
+	/**
+	 * 订单ID
+	 */
+	@ApiModelProperty(value = "订单ID")
+	private Long orderId;
+
 	private String trayCode;
 
 
 
+
+
+
 	/**
 	 * 商场名称
 	 */

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

@@ -116,6 +116,13 @@ public interface ITaskQuestService extends BaseService<TaskQuestEntity> {
 	List<WarehouseMaterialVO> findMaterialList(TaskSearchDTO taskSearchDTO);
 
 
+	/**
+	 * 盘点合同查询详情
+	 * @param taskSearchDTO
+	 * @return
+	 */
+	R contractQuestDetail(TaskSearchDTO taskSearchDTO);
+
 	IPage <QuestDetailVO> SelectStrip(IPage<TaskQuestVO> page,Long id);
 
 	IPage <QuestDetailVO> SelectInventory(IPage<TaskQuestVO> page,Long id);