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

blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IInventoryDetailClient.java

@@ -6,6 +6,8 @@ import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
+import java.util.List;
+
 @FeignClient(
 	value = ModuleNameConstant.APPLICATION_OLDPROJECT_NAME
 )
@@ -19,6 +21,10 @@ public interface IInventoryDetailClient {
 	@GetMapping(API_PREFIX + "/findUnitNoIsExist")
 	InventoryDetailEntity findUnitNoIsExist(@RequestParam String unitNo);
 
+	@GetMapping(API_PREFIX + "/findAllTrayType")
+	List<InventoryDetailEntity> findAllTrayType();
+
+
 //	@GetMapping(API_PREFIX + "/getEntityByOrderCode")
 //	OrderCountEntity getEntityByOrderCode(@RequestParam String orderCode, @RequestParam Integer oldWarehouseId);
 }

blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/ITrayScanDesClient.java

@@ -21,6 +21,9 @@ public interface ITrayScanDesClient {
 	@GetMapping(API_PREFIX + "/findZeroListByOrderCodeAndWarehouseId")
 	List<TrayScanDesEntity> findZeroListByOrderCodeAndWarehouseId(@RequestParam String orderCode, @RequestParam Integer oldWarehouseId);
 
+	@GetMapping(API_PREFIX + "/findScanTypeId")
+    TrayScanDesEntity findScanTypeId(@RequestParam Integer trayId, @RequestParam String unitNo, @RequestParam Integer oldWarehouseId);
+
 //	@GetMapping(API_PREFIX + "/getEntityByOrderCode")
 //	OrderCountEntity getEntityByOrderCode(@RequestParam String orderCode, @RequestParam Integer oldWarehouseId);
 }

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

@@ -168,21 +168,25 @@ public class QuestDetailEntity extends TenantEntity {
 	/**
 	 * 物料编码
 	 */
+	@ApiModelProperty(value = "物料编码")
 	private String materialCode;
 
 	/**
 	 * 物料名称
 	 */
+	@ApiModelProperty(value = "物料名称")
 	private String materialName;
 
 	/**
 	 * 商场名称
 	 */
+	@ApiModelProperty(value = "商场名称")
 	private String marketName;
 
 	/**
 	 * 批次号
 	 */
+	@ApiModelProperty(value = "批次号")
 	private String incomingBatch;
 
 

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

@@ -114,11 +114,38 @@ public class QuestDetailVO extends QuestDetailEntity {
 	/**
 	 * 收货单位
 	 */
-	@ApiModelProperty(value = "发站仓")
+	@ApiModelProperty(value = "收货单位")
 	private String consigneeUnit;
 
 
 	/* ----------- 库存品 --------------------- */
 
 
+	/* ----------- 零担 --------------------- */
+
+	/**
+	 * 运单号
+	 */
+	@ApiModelProperty(value = "运单号")
+	private String waybillNumber;
+
+	/**
+	 * 运单收货人
+	 */
+	@ApiModelProperty(value = "运单收货人")
+	private String consigneePerson;
+
+	/**
+	 * 运单收货地址
+	 */
+	@ApiModelProperty(value = "运单收货地址")
+	private String consigneeAddress;
+
+	/**
+	 * 运单收货电话
+	 */
+	@ApiModelProperty(value = "运单收货电话")
+	private String consigneeMobile;
+
+
 }

blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/InventoryDetailClient.java

@@ -6,6 +6,8 @@ import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.RestController;
 import springfox.documentation.annotations.ApiIgnore;
 
+import java.util.List;
+
 @ApiIgnore()
 @RestController
 @AllArgsConstructor
@@ -22,4 +24,9 @@ public class InventoryDetailClient implements IInventoryDetailClient{
 	public InventoryDetailEntity findUnitNoIsExist(String unitNo) {
 		return inventoryDetailService.findUnitNoIsExist(unitNo);
 	}
+
+	@Override
+	public List<InventoryDetailEntity> findAllTrayType() {
+		return inventoryDetailService.findAllTrayType();
+	}
 }

blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/TrayScanDesClient.java

@@ -24,4 +24,9 @@ public class TrayScanDesClient implements ITrayScanDesClient {
 	public List<TrayScanDesEntity> findZeroListByOrderCodeAndWarehouseId(String orderCode, Integer oldWarehouseId) {
 		return trayScanDesService.findZeroListByOrderCodeAndWarehouseId(orderCode, oldWarehouseId);
 	}
+
+	@Override
+	public TrayScanDesEntity findScanTypeId(Integer trayId, String unitNo, Integer oldWarehouseId) {
+		return trayScanDesService.findScanTypeId(trayId,unitNo,oldWarehouseId);
+	}
 }

blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/InventoryDetailMapper.java

@@ -5,10 +5,13 @@ import com.logpm.oldproject.entity.InventoryDetailEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 @Mapper
 public interface InventoryDetailMapper extends BaseMapper<InventoryDetailEntity> {
 	InventoryDetailEntity findOrderIsExist(@Param("orderCode") String orderCode);
 
 	InventoryDetailEntity findUnitNoIsExist(@Param("unitNo") String unitNo);
 
+	List<InventoryDetailEntity> findAllTrayType();
 }

blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/InventoryDetailMapper.xml

@@ -22,4 +22,17 @@
             limit 1
     </select>
 
+    <select id="findAllTrayType" resultType="com.logpm.oldproject.entity.InventoryDetailEntity">
+
+        select unitNo unitNo,
+               tray_id trayId
+        from ht_inventory_detail
+        where inventory_id in (185,187,188,189)
+        and tray_id != 0
+        and unitNo != '10215486=027916'
+        group by unitNo,
+            tray_id
+
+    </select>
+
 </mapper>

blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/IInventoryDetailService.java

@@ -2,10 +2,14 @@ package com.logpm.oldproject.service;
 
 import com.logpm.oldproject.entity.InventoryDetailEntity;
 
+import java.util.List;
+
 public interface IInventoryDetailService {
 
 
 	InventoryDetailEntity findOrderIsExist(String orderCode);
 
 	InventoryDetailEntity findUnitNoIsExist(String unitNo);
+
+	List<InventoryDetailEntity> findAllTrayType();
 }

blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/ITrayScanDesService.java

@@ -8,4 +8,6 @@ public interface ITrayScanDesService {
     List<TrayScanDesEntity> findListByOrderCodeAndWarehouseId(String orderCode, Integer oldWarehouseId);
 
 	List<TrayScanDesEntity> findZeroListByOrderCodeAndWarehouseId(String orderCode, Integer oldWarehouseId);
+
+    TrayScanDesEntity findScanTypeId(Integer trayId, String unitNo, Integer oldWarehouseId);
 }

blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/InventoryDetailServiceImpl.java

@@ -6,6 +6,8 @@ import com.logpm.oldproject.service.IInventoryDetailService;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 @Service
 @AllArgsConstructor
 public class InventoryDetailServiceImpl implements IInventoryDetailService {
@@ -21,4 +23,9 @@ public class InventoryDetailServiceImpl implements IInventoryDetailService {
 	public InventoryDetailEntity findUnitNoIsExist(String unitNo) {
 		return inventoryDetailMapper.findUnitNoIsExist(unitNo);
 	}
+
+	@Override
+	public List<InventoryDetailEntity> findAllTrayType() {
+		return inventoryDetailMapper.findAllTrayType();
+	}
 }

blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/TrayScanDesServiceImpl.java

@@ -28,4 +28,14 @@ public class TrayScanDesServiceImpl implements ITrayScanDesService {
 	public List<TrayScanDesEntity> findZeroListByOrderCodeAndWarehouseId(String orderCode, Integer oldWarehouseId) {
 		return trayScanDesMapper.findZeroListByOrderCodeAndWarehouseId(orderCode,oldWarehouseId);
 	}
+
+	@Override
+	public TrayScanDesEntity findScanTypeId(Integer trayId, String unitNo, Integer oldWarehouseId) {
+		QueryWrapper<TrayScanDesEntity> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("now_warehouse_id",oldWarehouseId)
+			.eq("type",1)
+			.eq("tray_id",trayId)
+			.eq("unitNo",unitNo);
+		return trayScanDesMapper.selectOne(queryWrapper);
+	}
 }

blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/SyncOrderInfoToPlatform.java

@@ -34,6 +34,7 @@ public class SyncOrderInfoToPlatform {
 	private final IOrderSyncRecordService orderSyncRecordService;
 	private final ISyncOrderInfoService syncOrderInfoService;
 
+
 	@XxlJob("syncOrderInfo")
 	public ReturnT<String> syncOrderInfo(String param) {
 
@@ -223,4 +224,30 @@ public class SyncOrderInfoToPlatform {
 	}
 
 
+	@XxlJob("syncTrayType")
+	public ReturnT<String> syncTrayType(String param) {
+		log.info("############syncTrayType: 同步打托数据开始");
+
+		//查询需要同步的仓库
+		List<WarehouseMappingDataEntity> warehouseMappingDataEntityList = warehouseMappingDataService.getWarehouseMapping();
+		if(warehouseMappingDataEntityList.isEmpty()){
+			log.warn("###############syncZeroOrderInfo: 当前没有配置需要同步的仓库信息");
+			return ReturnT.FAIL;
+		}
+		for (WarehouseMappingDataEntity entity:warehouseMappingDataEntityList){
+			Integer oldWarehouseId = entity.getOldWarehouseId();
+			Long newWarehouseId = entity.getNewWarehouseId();
+
+			syncOrderInfoService.syncTrayType(oldWarehouseId,newWarehouseId);
+		}
+
+		return ReturnT.SUCCESS;
+	}
+
+//	@XxlJob("syncEntryTime")
+//	public ReturnT<String> syncTrayType(String param) {
+//
+//	}
+
+
 }

blade-service/logpm-patch/src/main/java/com/logpm/patch/service/ISyncOrderInfoService.java

@@ -6,4 +6,7 @@ public interface ISyncOrderInfoService {
 	void handleData(List<String> orderCodeList,Integer oldWarehouseId,Long newWarehouseId);
 
 	void handleDataZero(List<String> orderCodeList, Integer oldWarehouseId, Long newWarehouseId);
+
+	void syncTrayType(Integer oldWarehouseId,Long newWarehouseId);
+
 }

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

@@ -122,6 +122,13 @@ public class SyncOrderInfoServiceImpl implements ISyncOrderInfoService {
 		}
 	}
 
+	@Override
+	public void syncTrayType(Integer oldWarehouseId,Long newWarehouseId) {
+
+		saveTrayTypeInfoPackageNew(oldWarehouseId,newWarehouseId);
+
+	}
+
 	private void saveTrayTypeInfoPackage(String orderCode,Integer oldWarehouseId,Long newWarehouseId) {
 
 		//如果是订制品就先查询该订单有哪些包件打了托
@@ -995,4 +1002,60 @@ public class SyncOrderInfoServiceImpl implements ISyncOrderInfoService {
 
 		return wayBillEntity;
 	}
+
+	private void saveTrayTypeInfoPackageNew(Integer oldWarehouseId, Long newWarehouseId) {
+
+
+		List<InventoryDetailEntity> ls = inventoryDetailClient.findAllTrayType();
+		for (InventoryDetailEntity entity:ls){
+
+			Integer trayId = entity.getTrayId();
+			String unitNo = entity.getUnitNo();//包条码
+
+			TrayScanDesEntity trayScanDesEntity = trayScanDesClient.findScanTypeId(trayId,unitNo,oldWarehouseId);
+			Integer trayScanId = trayScanDesEntity.getTrayScanId();
+
+			InventoryDetailEntity inventoryDetailEntity = inventoryDetailClient.findUnitNoIsExist(unitNo);
+			if(Objects.isNull(inventoryDetailEntity)){
+				log.info("###########saveTrayTypeInfoPackage: 包条不在盘点任务中存在，不同步 unitNo={}",unitNo);
+				continue;
+			}
+			//查询打托方式信息
+			TrayScanEntity trayScanEntity = trayScanClient.getEntityByTrayScanId(trayScanId);
+			Integer type = trayScanEntity.getType();
+
+			//方式：1=仓，2=商场，3=客户，4=其他,5=服务号，6=合同号
+			//方式：60=仓，30=商场，50=客户，100=其他,10=服务号，20=合同号
+			String newTrayType = "100";
+			if(1==type){
+				newTrayType = "60";
+			}else if(2==type){
+				newTrayType = "30";
+			}else if(3==type){
+				newTrayType = "50";
+			}else if(4==type){
+				newTrayType = "100";
+			}else if(5==type){
+				newTrayType = "10";
+			}else if(6==type){
+				newTrayType = "20";
+			}
+
+			Map<String,Object> map = new HashMap<>();
+			map.put("trayType",newTrayType);
+			map.put("trayCode","T"+trayId);
+			map.put("warehouseId",newWarehouseId);
+			map.put("orderPackageCode",unitNo);
+
+			//新系统保存打托方式
+			boolean b = warehouseTrayTypeClient.orderScanOrderPackageCode(map);
+
+			if(!b){
+				log.error("################saveTrayTypeInfo: 包件打托失败 unitNo={} trayCode={}",unitNo,"T"+trayId);
+				throw new CustomerException(403,"包件打托失败");
+			}
+		}
+	}
+
+
 }

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

@@ -82,7 +82,7 @@ public class TaskQuestController extends BladeController {
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "盘点任务 任务下的包条", notes = "传入taskQuest")
 	public R<IPage<QuestDetailVO>> SelectStrip(Long id, Query query) {
-		IPage<QuestDetailVO> list = taskQuestService.SelectStrip(Condition.getPage(query),id);
+		IPage<QuestDetailVO> list = taskQuestService.selectStrip(Condition.getPage(query),id);
 		return R.data(list);
 	}
 
@@ -93,7 +93,7 @@ public class TaskQuestController extends BladeController {
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "盘点任务 任务下的库存品", notes = "传入id")
 	public R<IPage<QuestDetailVO>> SelectInventory(Long id,Query query) {
-		IPage<QuestDetailVO> list = taskQuestService.SelectInventory(Condition.getPage(query),id);
+		IPage<QuestDetailVO> list = taskQuestService.selectInventory(Condition.getPage(query),id);
 		return R.data(list);
 	}
 
@@ -102,9 +102,9 @@ public class TaskQuestController extends BladeController {
 	 */
 	@GetMapping("/SelectZreo")
 	@ApiOperationSupport(order = 1)
-	@ApiOperation(value = "盘点任务 任务下的库存品", notes = "传入id")
+	@ApiOperation(value = "盘点任务 任务下的零担", notes = "传入id")
 	public R<IPage<QuestDetailVO>> SelectZero(Long id,Query query) {
-		IPage<QuestDetailVO> list = taskQuestService.SelectZero(Condition.getPage(query),id);
+		IPage<QuestDetailVO> list = taskQuestService.selectZero(Condition.getPage(query),id);
 		return R.data(list);
 	}
 

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

@@ -164,6 +164,7 @@
         ldpl.third_product thirdProduct,
         ldpl.material_name materialName,
         ldpl.brand_name brandName,
+        ldpl.send_warehouse_name sendWarehouseName,
         ldsa.consignee_unit consigneeUnit
         FROM
             logpm_quest_detail lqd
@@ -183,6 +184,7 @@
         lqd.material_code materialCode,
         lqd.market_name marketName,
         lqd.incoming_batch incomingBatch,
+        lqd.update_time updateTime,
         lqd.position_code positionCode,
         lqd.material_name materialName,
         ldsl.service_number serviceNumber,
@@ -190,7 +192,6 @@
         FROM
             logpm_quest_detail lqd
                 JOIN logpm_distribution_stock_list ldsl ON lqd.stock_id = ldsl.id
-                AND lqd.incoming_batch = ldsl.incoming_batch
                 AND lqd.quest_target =3
         <where>
             lqd.is_deleted =0 and lqd.quest_id = #{questId}
@@ -198,11 +199,23 @@
     </select>
     <select id="selectZeroListByQuestId" resultType="com.logpm.warehouse.vo.QuestDetailVO">
         SELECT
-            lqd.*
+        lqd.id id,
+        lqd.order_id orderId,
+        lqd.order_code orderCode,
+        ldsa.description_goods categoryName,
+        lqd.stock_num stockNum,
+        lqd.position_code positionCode,
+        lqd.quest_status questStatus,
+        lqd.update_time updateTime,
+        lqd.tray_code trayCode,
+        ldsa.waybill_number waybillNumber,
+        ldsa.consignee_person consigneePerson,
+        ldsa.consignee_address consigneeAddress,
+        ldsa.consignee_mobile consigneeMobile
         FROM
-            logpm_quest_detail lqd
-                JOIN logpm_distribution_stock_article ldsa ON lqd.order_id = ldsa.id
-                AND lqd.quest_target =2
+        logpm_quest_detail lqd
+        JOIN logpm_distribution_stock_article ldsa ON lqd.order_id = ldsa.id
+        AND lqd.quest_target =2
         <where>
             lqd.is_deleted =0 and lqd.quest_id = #{questId}
         </where>

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

@@ -123,11 +123,11 @@ public interface ITaskQuestService extends BaseService<TaskQuestEntity> {
 	 */
 	R contractQuestDetail(TaskSearchDTO taskSearchDTO);
 
-	IPage <QuestDetailVO> SelectStrip(IPage<QuestDetailVO> page,Long id);
+	IPage <QuestDetailVO> selectStrip(IPage<QuestDetailVO> page,Long id);
 
-	IPage <QuestDetailVO> SelectInventory(IPage<QuestDetailVO> page,Long id);
+	IPage <QuestDetailVO> selectInventory(IPage<QuestDetailVO> page,Long id);
 
-	IPage <QuestDetailVO> SelectZero(IPage<QuestDetailVO> page,Long id);
+	IPage <QuestDetailVO> selectZero(IPage<QuestDetailVO> page,Long id);
 
 	R questScanAllcation(TaskSearchDTO taskSearchDTO);
 

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

@@ -1249,7 +1249,7 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 	}
 
 	@Override
-	public IPage<QuestDetailVO> SelectStrip(IPage<QuestDetailVO> page,Long id) {
+	public IPage<QuestDetailVO> selectStrip(IPage<QuestDetailVO> page,Long id) {
 		List <QuestDetailVO> questDetailVOList = baseMapper.selectStripListByQuestId(page,id);
 		if (!questDetailVOList.isEmpty()){
 		for (QuestDetailVO questDetailVO : questDetailVOList) {
@@ -1265,7 +1265,7 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 	}
 
 	@Override
-	public IPage<QuestDetailVO> SelectInventory(IPage<QuestDetailVO> page,Long id) {
+	public IPage<QuestDetailVO> selectInventory(IPage<QuestDetailVO> page,Long id) {
 		List<QuestDetailVO> questDetailVOList = baseMapper.selectInventoryListByQuestId(page,id);
 		if (!questDetailVOList.isEmpty()){
 			for (QuestDetailVO questDetailVO : questDetailVOList) {
@@ -1281,7 +1281,7 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 	}
 
 	@Override
-	public IPage<QuestDetailVO> SelectZero(IPage<QuestDetailVO> page,Long id) {
+	public IPage<QuestDetailVO> selectZero(IPage<QuestDetailVO> page,Long id) {
 		List<QuestDetailVO> questDetailVOList = baseMapper.selectZeroListByQuestId(page,id);
 		if (!questDetailVOList.isEmpty()){
 			for (QuestDetailVO questDetailVO : questDetailVOList) {