tips:

1.增加梦天车次的查询
2.增加多发运车次的补充推送
3.增加对订单的推送记录查询

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

@@ -20,14 +20,14 @@ public class DictBizConstant {
 
 
 	public static final String ORDER_PACKAGE_STATUS = "order_package_status";//配送包件状态
-	public static final String ORDER_PACKAGE_FREEZE_STATUS = "order_package_freeze_status";//包间冻结状态
-	public static final String ORDER_PACKAGE_STOCKUP_STATUS = "order_package_stockup_status";//包间备货状态
-	public static final String ORDER_PACKAGE_GROUNDING_STATUS = "order_package_grounding_status";//包间上架状态
+	public static final String ORDER_PACKAGE_FREEZE_STATUS = "order_package_freeze_status";//包件冻结状态
+	public static final String ORDER_PACKAGE_STOCKUP_STATUS = "order_package_stockup_status";//包件备货状态
+	public static final String ORDER_PACKAGE_GROUNDING_STATUS = "order_package_grounding_status";//包件上架状态
 	public static final String ORDER_PACKAGE_RESERVATION_STATUS = "order_package_reservation_status";//包件预约状态
-	public static final String STOCK_ALLOCATION = "stock_assign_status";//包间上架状态
+	public static final String STOCK_ALLOCATION = "stock_assign_status";//包件上架状态
 	public static final String CERTIFICATE_TYPE = "certificate_type";//证件类型
 	public static final String DELIVERY_COST = "delivery_cost";//证件类型
-	public static final String LOGPM_UNIT = "logpm_unit";//包间上架状态
+	public static final String LOGPM_UNIT = "logpm_unit";//包件上架状态
 
 
 

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-api/logpm-factory-api/src/main/java/com/logpm/factory/mt/entity/MtFactoryOrderMain.java

@@ -1,5 +1,6 @@
 package com.logpm.factory.mt.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;
@@ -62,6 +63,7 @@ public class MtFactoryOrderMain extends BaseEntity {
 
 	//@JsonProperty("反馈梦天状态")
 	@ApiModelProperty(value = "反馈梦天状态")
+	@TableField(exist = false)
 	private Integer pushStatus;
 //
 //	//@JsonProperty("推送时间")

blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/mt/vo/MtPackageInfoDetailVO.java

@@ -5,7 +5,7 @@ import lombok.Data;
 import java.util.List;
 
 /**
- * 梦天包间详情
+ * 梦天包件详情
  */
 @Data
 public class MtPackageInfoDetailVO extends MtPackageInfoVO {

blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/snm/feign/IMtOrderMainClinet.java

@@ -20,7 +20,7 @@ public interface IMtOrderMainClinet {
 
 
 	/**
-	 * 获取梦天工厂订单 包间 主订单 的关系
+	 * 获取梦天工厂订单 包件 主订单 的关系
 	 *
 	 * @return
 	 */

blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/snm/vo/MTOrderPackageRelationVO.java

@@ -6,7 +6,7 @@ import java.io.Serializable;
 
 
 /**
- * 梦天 订单 主订单 包间 关系 用于判断车次中的订单是否包含
+ * 梦天 订单 主订单 包件 关系 用于判断车次中的订单是否包含
  */
 @Data
 public class MTOrderPackageRelationVO implements Serializable {

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

@@ -81,7 +81,7 @@ public interface IAdvanceDetailClient {
 
 
 	/**
-	 * 根据卸车车次 查询老系统中 这个车次中装的包间
+	 * 根据卸车车次 查询老系统中 这个车次中装的包件
 	 * @param unloadCarNum
 	 * @return
 	 */

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java

@@ -81,11 +81,11 @@ public class DistributionDeliveryListController extends BladeController {
 	}
 
 	/**
-	 * 查看包间明细 详情
+	 * 查看包件明细 详情
 	 */
 	@GetMapping("/wrapdetail")
 	@ApiOperationSupport(order = 1)
-	@ApiOperation(value = "查看包间详情", notes = "传入distributionDeliveryList")
+	@ApiOperation(value = "查看包件详情", notes = "传入distributionDeliveryList")
 	public R<IPage<DistributionDeliveryInfoVO>> wrapdetail(DistributionDeliveryInfoDTO distributionDeliveryInfoDTO, Query query) {
 		IPage<DistributionDeliveryInfoVO> pages = distributionDeliveryInfoService.selectDistributionDeliveryInfowrapPage(Condition.getPage(query), distributionDeliveryInfoDTO);
 		return R.data(pages);

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

@@ -646,7 +646,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		5. 更新
 		5.1 更新预约单的状态
 		5.2 更新预约单关联的订单状态
-		5.3 更新预约单关联订单下面的包间状态
+		5.3 更新预约单关联订单下面的包件状态
 		5.4 更新配送表状态
 		#5.3 更新预约单关联库存品的数量
 		 */

blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/controller/MtFactoryOrderMainController.java

@@ -1,11 +1,13 @@
 
 package com.logpm.factory.mt.controller;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.logpm.factory.mt.entity.MtFactoryOrderMain;
 import com.logpm.factory.mt.service.IMtFactoryOrderMainService;
 import com.logpm.factory.mt.vo.MtFactoryOrderMainVO;
+import com.logpm.factory.mt.vo.MtPackageInfoVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -36,6 +38,8 @@ public class MtFactoryOrderMainController extends BladeController {
 
 	private final IMtFactoryOrderMainService mtfactoryOrderMainService;
 
+
+
 	/**
 	 * 梦天工厂主订单 详情
 	 */
@@ -66,7 +70,10 @@ public class MtFactoryOrderMainController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入mtfactoryOrderMain")
 	public R<IPage<MtFactoryOrderMainVO>> listBySendData(@ApiIgnore @RequestParam Map<String, Object> mtfactoryOrderMain, Query query) {
-		IPage<MtFactoryOrderMainVO> pages = mtfactoryOrderMainService.selectMtFactoryOrderMainByPushType(Condition.getPage(query), Condition.getQueryWrapper(mtfactoryOrderMain, MtFactoryOrderMainVO.class));
+		MtFactoryOrderMainVO mainVO
+			= JSON.parseObject(JSON.toJSONString(mtfactoryOrderMain), MtFactoryOrderMainVO.class);
+
+		IPage<MtFactoryOrderMainVO> pages = mtfactoryOrderMainService.selectMtFactoryOrderMainByPushType(Condition.getPage(query), mainVO);
 		return R.data(pages);
 	}
 
@@ -121,7 +128,18 @@ public class MtFactoryOrderMainController extends BladeController {
 		return R.status(mtfactoryOrderMainService.deleteLogic(Func.toLongList(ids)));
 	}
 
+	/**
+	 * 梦天车次推送
+	 */
+	@PostMapping("/beachPush")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "梦天车次推送", notes = "传入ids")
+	public R beachPush(@ApiParam(value = "主键集合", required = true) @RequestParam String ids,@ApiParam(value = "推送时间", required = false)String data ) {
+
+		List<Long> longs = Func.toLongList(ids);
 
+		return R.status(mtfactoryOrderMainService.beachPush(longs,data));
+	}
 
 
 

blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/controller/MtPackageInfoController.java

@@ -166,7 +166,6 @@ public class MtPackageInfoController extends BladeController {
 
 		List<Long> longs = Func.toLongList(ids);
 
-
 		return R.status(mtpackageInfoService.beachPush(longs,data));
 	}
 

blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/mapper/MtFactoryOrderMainMapper.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.logpm.factory.mt.entity.MtFactoryOrderMain;
 import com.logpm.factory.mt.vo.MtFactoryOrderMainVO;
 import com.logpm.factory.snm.vo.MTOrderPackageRelationVO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -23,6 +24,6 @@ public interface MtFactoryOrderMainMapper extends BaseMapper<MtFactoryOrderMain>
 	List<MtFactoryOrderMainVO> selectMtFactoryOrderMainPage(IPage page, MtFactoryOrderMainVO mtfactoryOrderMain);
 
 
-	List<MtFactoryOrderMain> selectMtFactoryOrderMainByPushType(IPage page, QueryWrapper mtFactoryOrderMain);
+	List<MtFactoryOrderMain> selectMtFactoryOrderMainByPushType(IPage page, @Param("mtFactoryOrderMain") MtFactoryOrderMainVO mtFactoryOrderMain);
 
 }

blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/mapper/MtFactoryOrderMainMapper.xml

@@ -38,7 +38,6 @@
         <result column="update_time" property="updateTime"/>
         <result column="status" property="status"/>
         <result column="is_deleted" property="isDeleted"/>
-        <result column="push_status" property="pushStatus"/>
     </resultMap>
 
 
@@ -74,7 +73,9 @@ where mfom.push_status is null
             mpd.push_status
         from mt_factory_order_main mfo LEFT JOIN mt_push_data mpd on mpd.ref_id= mfo.id
         <where>
-
+            <if test="mtFactoryOrderMain.invoiceOrderCode!=null ">
+                and mfo.invoice_order_code= #{mtFactoryOrderMain.invoiceOrderCode}
+            </if>
 
         </where>
     </select>

blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/mapper/MtPackageInfoMapper.java

@@ -24,7 +24,7 @@ public interface MtPackageInfoMapper extends BaseMapper<MtPackageInfo> {
 	List<MtPackageInfoVO> listBySendData(IPage<MtPackageInfoVO> page,@Param("mtPackageInfoVO") MtPackageInfoVO mtPackageInfoVO);
 
 	/**
-	 * 查询单个包间信息对象
+	 * 查询单个包件信息对象
 	 * @param mtpackageInfo
 	 * @return
 	 */

blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/service/IMtFactoryOrderMainService.java

@@ -30,12 +30,14 @@ public interface IMtFactoryOrderMainService extends BaseService<MtFactoryOrderMa
 	IPage<MtFactoryOrderMainVO> selectMtFactoryOrderMainPage(IPage<MtFactoryOrderMainVO> page, MtFactoryOrderMainVO mtfactoryOrderMain);
 
 
-	IPage<MtFactoryOrderMainVO> selectMtFactoryOrderMainByPushType(IPage<MtFactoryOrderMainVO> page, QueryWrapper mtFactoryOrderMain);
-
-
-
-
-
+	IPage<MtFactoryOrderMainVO> selectMtFactoryOrderMainByPushType(IPage<MtFactoryOrderMainVO> page, MtFactoryOrderMainVO mtFactoryOrderMain);
 
 
+	/**
+	 * 推送车次
+	 * @param longs
+	 * @param data
+	 * @return
+	 */
+	Boolean beachPush(List<Long> longs, String data);
 }

blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/service/IMtPackageInfoService.java

@@ -26,7 +26,7 @@ public interface IMtPackageInfoService extends BaseService<MtPackageInfo> {
 	Boolean beachPush(List<Long> toLongList, String data);
 
 	/**
-	 * 查询 包间详情
+	 * 查询 包件详情
 	 * @param mtpackageInfo
 	 * @return
 	 */

blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/service/impl/MtFactoryDataServiceImpl.java

@@ -497,11 +497,23 @@ public class MtFactoryDataServiceImpl implements IMtFactoryDataService {
 
 		//推送数据到梦天
 		//请求参数
-		logger.info(">>>>>>sendUnloadCarNum tag ={}", 1);
 		R r =sendMtFactoryData(mtFactoryProperties.getUrl() + "/ZXCFaHuoDan/QueRenShouHuo", s, 4,unloadCarNum);
-		logger.info(">>>>>>sendUnloadCarNum r ={}", r);
-
-		logger.info(">>>>>>sendUnloadCarNum tag ={}", 2);
+		if (r.getCode() == ResultCode.SUCCESS.getCode()) {
+			log.info("##################{} 梦天确认签收数据推送2", unloadCarNum);
+			MtPushData mtPushData = new MtPushData();
+			mtPushData.setPushTime(new Date());
+			mtPushData.setPushStatus(1);// 推送状态
+			mtPushData.setRefCode(unloadCarNum);
+			mtPushData.setRefType(1);// 订单主表
+			// todo  这里需要查询主推送单的 ID
+			List<MtFactoryOrderMain> mtFactoryOrderMainList = mtFactoryOrderMainService.findMtFactoryOrderMainByInvoiceOrderCode(unloadCarNum);
+			if (mtFactoryOrderMainList.size() > 0) {
+				mtFactoryOrderMainList.get(0);
+				mtPushData.setRefId(mtFactoryOrderMainList.get(0).getId());
+			}
+			// 插入推送数据
+			mtPushDataService.save(mtPushData);
+		}
 
 		return r;
 

blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/service/impl/MtFactoryOrderMainServiceImpl.java

@@ -2,24 +2,39 @@ package com.logpm.factory.mt.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
+import com.fasterxml.jackson.core.JsonProcessingException;
 import com.logpm.factory.mt.entity.MtFactoryOrderMain;
 import com.logpm.factory.mt.mapper.MtFactoryOrderMainMapper;
+import com.logpm.factory.mt.service.IMtFactoryDataService;
 import com.logpm.factory.mt.service.IMtFactoryOrderMainService;
 import com.logpm.factory.mt.vo.MtFactoryOrderMainVO;
 import com.logpm.factory.mt.wrapper.MtFactoryOrderMainWrapper;
 import com.logpm.factory.snm.vo.MTOrderPackageRelationVO;
 import lombok.AllArgsConstructor;
+import lombok.val;
 import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.core.tool.utils.DateUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 
+import java.security.NoSuchAlgorithmException;
+import java.text.ParseException;
+import java.util.Date;
 import java.util.List;
 
-@AllArgsConstructor
 @Service
 public class MtFactoryOrderMainServiceImpl extends BaseServiceImpl<MtFactoryOrderMainMapper, MtFactoryOrderMain> implements IMtFactoryOrderMainService {
 
-	private final MtFactoryOrderMainMapper mtFactoryOrderMainMapper;
+	@Autowired
+	private  MtFactoryOrderMainMapper mtFactoryOrderMainMapper;
+
+	@Autowired
+	@Lazy
+	private IMtFactoryDataService mtFactoryDataService;
+
 
 	@Override
 	public List<MTOrderPackageRelationVO> mtOrderPackageRelation() {
@@ -41,10 +56,32 @@ public class MtFactoryOrderMainServiceImpl extends BaseServiceImpl<MtFactoryOrde
 	}
 
 	@Override
-	public IPage<MtFactoryOrderMainVO> selectMtFactoryOrderMainByPushType(IPage<MtFactoryOrderMainVO> page, QueryWrapper mtFactoryOrderMain) {
+	public IPage<MtFactoryOrderMainVO> selectMtFactoryOrderMainByPushType(IPage<MtFactoryOrderMainVO> page, MtFactoryOrderMainVO mtFactoryOrderMain) {
 		List<MtFactoryOrderMain> ls = baseMapper.selectMtFactoryOrderMainByPushType(page, mtFactoryOrderMain);
 		page.setRecords(MtFactoryOrderMainWrapper.build().listVO(ls)) ;
 		return page;
 
 	}
+
+	@Override
+	public Boolean beachPush(List<Long> longs, String data) {
+
+		if(StringUtils.isNotEmpty(data)){
+			data  = DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss");
+		}
+
+		for (Long aLong : longs) {
+			MtFactoryOrderMain mtFactoryOrderMain = baseMapper.selectById(aLong);
+			try {
+				mtFactoryDataService.sendUnloadCarNum(mtFactoryOrderMain.getInvoiceOrderCode(),data);
+			} catch (ParseException e) {
+				e.printStackTrace();
+			} catch (JsonProcessingException e) {
+				e.printStackTrace();
+			} catch (NoSuchAlgorithmException e) {
+				e.printStackTrace();
+			}
+		}
+		return true;
+	}
 }

blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/service/impl/MtPackageInfoServiceImpl.java

@@ -70,7 +70,7 @@ public class MtPackageInfoServiceImpl extends BaseServiceImpl<MtPackageInfoMappe
 	private OrderStatusDTO buildOrderStatusDTO(Long t, String data) {
 
 		OrderStatusDTO orderStatusDTO = new OrderStatusDTO();
-		// 通过包件id 查询包间
+		// 通过包件id 查询包件
 		MtPackageInfo mtPackageInfo = baseMapper.selectById(t);
 		orderStatusDTO.setUnitNo(mtPackageInfo.getPackageCode());
 		orderStatusDTO.setOrderNo(mtPackageInfo.getOrderCode());
@@ -83,8 +83,7 @@ public class MtPackageInfoServiceImpl extends BaseServiceImpl<MtPackageInfoMappe
 	@Override
 	public MtPackageInfoVO getMtPackageInfo(MtPackageInfo mtpackageInfo) {
 		MtPackageInfoVO mtPackageInfoVO = baseMapper.getMtPackageInfo(mtpackageInfo);
-
-
+		mtPackageInfoVO.setPushStatusName(ObjectUtil.isEmpty(mtPackageInfoVO.getPushStatus()) ? "未推送" : "已推送");
 		return mtPackageInfoVO;
 	}
 }

blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/UnloadCarComHandler.java

@@ -66,7 +66,7 @@ public class UnloadCarComHandler {
 		2. 需要判断这个车次是否市梦天的
 		3. 查询这个车次上的运单是否市梦天的
 
-		4.查询包间对应的梦天发给我们的批次号
+		4.查询包件对应的梦天发给我们的批次号
 		 */
 		UnloadCarDTO unloadCarDTO = (UnloadCarDTO) map.get("messageData");
 		log.info("##################unloadCarComDataHandler：消费内容{}", unloadCarDTO);
@@ -89,9 +89,9 @@ public class UnloadCarComHandler {
 			for (String s : set) {
 				// 得到某个工厂运输批次的集合
 				List<MTOrderPackageRelationVO> t = stringListMap.get(s);
-				//得到这个批次下面所有的包间
+				//得到这个批次下面所有的包件
 				List<String> strs = t.stream().map(MTOrderPackageRelationVO::getPackageCode).collect(Collectors.toList());
-				// 当前批次的包间 在 这个配载计划中存在一个 则进行通知
+				// 当前批次的包件 在 这个配载计划中存在一个 则进行通知
 				for (String mtStr : carNumList) {
 					if (strs.contains(mtStr)) {
 						carNum = s;
@@ -140,22 +140,7 @@ public class UnloadCarComHandler {
 		}
 		R r = mtFactoryDataService.sendUnloadCarNum(carNum, completeDate);
 		log.info("##################{} 梦天确认签收数据推送1", carNum);
-		if (r.getCode() == ResultCode.SUCCESS.getCode()) {
-			log.info("##################{} 梦天确认签收数据推送2", carNum);
-			MtPushData mtPushData = new MtPushData();
-			mtPushData.setPushTime(new Date());
-			mtPushData.setPushStatus(1);// 推送状态
-			mtPushData.setRefCode(carNum);
-			mtPushData.setRefType(1);// 订单主表
-			// todo  这里需要查询主推送单的 ID
-			List<MtFactoryOrderMain> mtFactoryOrderMainList = mtFactoryOrderMainService.findMtFactoryOrderMainByInvoiceOrderCode(carNum);
-			if (mtFactoryOrderMainList.size() > 0) {
-				mtFactoryOrderMainList.get(0);
-				mtPushData.setRefId(mtFactoryOrderMainList.get(0).getId());
-			}
-			// 插入推送数据
-			mtPushDataService.save(mtPushData);
-		}
+
 	}
 
 

blade-service/logpm-factory/src/test/java/com/logpm/factory/TestService.java

@@ -68,7 +68,7 @@
 //		2. 需要判断这个车次是否市梦天的
 //		3. 查询这个车次上的运单是否市梦天的
 //
-//		4.查询包间对应的梦天发给我们的批次号
+//		4.查询包件对应的梦天发给我们的批次号
 //		 */
 //		UnloadCarDTO unloadCarDTO = new UnloadCarDTO();
 //		unloadCarDTO.setCompleteDate("2023-08-08 15:39:40");
@@ -91,9 +91,9 @@
 //				String carNum = null;
 //				// 得到某个工厂运输批次的集合
 //				List<MTOrderPackageRelationVO> t = stringListMap.get(s);
-//				//得到这个批次下面所有的包间
+//				//得到这个批次下面所有的包件
 //				List<String> strs = t.stream().map(MTOrderPackageRelationVO::getPackageCode).collect(Collectors.toList());
-//				// 当前批次的包间 在 这个配载计划中存在一个 则进行通知
+//				// 当前批次的包件 在 这个配载计划中存在一个 则进行通知
 //				for (String mtStr : carNumList) {
 //					if (strs.contains(mtStr)) {
 //						carNum = s;

doc/dpm/物流租户系统.pdma.json

@@ -13849,7 +13849,7 @@
         }
       },
       "defKey": "logpm_mainline_temporary_order",
-      "defName": "包间表",
+      "defName": "包件表",
       "comment": "",
       "properties": {
         "partitioned by": "(date string)",
@@ -58659,4 +58659,4 @@
       }
     }
   ]
-}
+}