Merge branch 'pre-production'

blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/CheckWaybillListDTO.java

@@ -0,0 +1,38 @@
+package com.logpm.trunkline.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class CheckWaybillListDTO {
+
+
+	/**
+	 * 运单ID集合
+	 */
+	private List<Long> waybillIds;
+
+
+	/**
+	 * 审核原因
+	 */
+	private String checkReson;
+
+	/**
+	 * 审核备注
+	 */
+	private String checkRemark;
+
+
+	/**
+	 * 仓库ID
+	 */
+	private Long warehouseId;
+
+	/**
+	 * 仓库名称
+	 */
+	private String warehouseName;
+
+}

blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/OpenOrderDTO.java

@@ -17,6 +17,8 @@ public class OpenOrderDTO implements Serializable {
 
 	private Long waybillId;
 
+
+
 	private Long brandId;//品牌id
 	private String brand;//品牌
 	private String trainNumber;//客户车次号

blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/java/com/logpm/factorydata/suofeiya/service/impl/DeliveryNoteServiceImpl.java

@@ -165,7 +165,7 @@ public class DeliveryNoteServiceImpl extends BaseServiceImpl<DeliveryNoteMapper,
 			advanceEntity.setServiceNum(orderInfoVO.getMainOrderNo());
 			advanceEntity.setSenderFactory(vo.getSendAddr());
 			// 工长名字为无，则取客户名字 工长名字不为无 则取工长电话 客户名字转工长名字
-			if(StrUtil.equals(orderInfoVO.getConnectName(),"无")){
+			if(StrUtil.equals(orderInfoVO.getConnectName(),"无") || StrUtil.isEmpty(orderInfoVO.getConnectName())){
 				advanceEntity.setCustomerName(orderInfoVO.getReceiver());
 				advanceEntity.setCustomerPhone(orderInfoVO.getReceiveTel());
 			}else{

blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/enums/NodeNeedEnums.java

@@ -17,9 +17,12 @@ public enum NodeNeedEnums implements Serializable {
 	UNLOAD_INCOMING_WAREHOUSE(105010,"卸车入库"),
 	// TRANSFER_WAREHOUSE_UNLOADING(105020, "中转仓卸车确认"),
 	TRANSFER_WAREHOUSE_DEPART(103080, "中转仓发车"),
-	SIGN_DIRECT_SHIPPER(105030,"直发商家签收"),
 	END_WAREHOUSE_UNLOADING(105040, "末端仓卸车确认"),
+
+	SIGN_DIRECT_SHIPPER(105030,"直发商家签收"),
 	DISTRIBUTION_SIGN_FOR(302060, "配送签收"),
+	SIGN_BILLOFLADING(301080, "自提签收"),
+	SIGN_BILLOFLADING_REVIEW(301090, "自提复核"),
 	SIGN_TRIPARTITE_TRANSFER_DEPART(104040, "三方中转签收"),
 	CLERK_REVIEW(303010, "文员复核");
 

blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/enums/ZbomNodeMappingEnums.java

@@ -50,9 +50,13 @@ public enum ZbomNodeMappingEnums {
 	DISTRIBUTION_SIGN_FOR(ZbomNodeEnums.SIGN_FOR, WorkNodeEnums.DISTRIBUTION_SIGN_FOR, 1),
 	SIGN_FOR_DIRECT_SHIPPER(ZbomNodeEnums.SIGN_FOR, WorkNodeEnums.SIGN_DIRECT_SHIPPER, 1),
 	SIGN_FOR_TRIPARTITE_TRANSFER_DEPART(ZbomNodeEnums.SIGN_FOR, WorkNodeEnums.SIGN_TRIPARTITE_TRANSFER_DEPART, 1),
+	SIGN_BILLOFLADING(ZbomNodeEnums.SIGN_FOR, WorkNodeEnums.SIGN_BILLOFLADING, 1),
+	SIGN_BILLOFLADING_REVIEW(ZbomNodeEnums.SIGN_FOR, WorkNodeEnums.SIGN_BILLOFLADING_REVIEW, 1),
 	/**
 	 * 部分签收 -- 文员复核
 	 */
+	PARTIAL_SIGN_BILLOFLADING(ZbomNodeEnums.SIGN_FOR, WorkNodeEnums.SIGN_BILLOFLADING, 2),
+	PARTIAL_SIGN_BILLOFLADING_REVIEW(ZbomNodeEnums.SIGN_FOR, WorkNodeEnums.SIGN_BILLOFLADING_REVIEW, 2),
 	PARTIAL_RECEIPT(ZbomNodeEnums.PARTIAL_RECEIPT, WorkNodeEnums.CLERK_REVIEW, 2),
 	PARTIAL_DISTRIBUTION_SIGN_FOR(ZbomNodeEnums.PARTIAL_RECEIPT, WorkNodeEnums.DISTRIBUTION_SIGN_FOR, 2),
 	PARTIAL_RECEIPT_DIRECT_SHIPPER(ZbomNodeEnums.PARTIAL_RECEIPT, WorkNodeEnums.SIGN_DIRECT_SHIPPER, 2),

blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/mq/ZbomNodeDataPushListener.java

@@ -144,7 +144,8 @@ public class ZbomNodeDataPushListener {
 				}
 				// 签收节点获取组装未签收数据
 				Map<String, Integer> noSignNumberMap = null;
-				if (EnumUtil.equals(WorkNodeEnums.CLERK_REVIEW, node)) {
+				ZbomNodeEnums zbNode = ZbomNodeMappingEnums.getZbomByNodeAndStatus(workNodeEnums);
+				if (StrUtil.equals(ZbomNodeEnums.SIGN_FOR.getCode(), zbNode.getCode())) {
 					noSignNumberMap = getNoSignNumber(content);
 				}
 				// 获取历史发送的节点数据

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/StatisticsOrderInfoMapper.xml

@@ -81,10 +81,10 @@
             and lsoi.type_service = #{param.typeService}
         </if>
         <if test="param.openTimeStart != null">
-            and lww.create_time &gt;= #{param.openTimeStart}
+            and lww.document_making_time &gt;= #{param.openTimeStart}
         </if>
         <if test="param.openTimeEnd != null">
-            and lww.create_time &lt;= #{param.openTimeEnd}
+            and lww.document_making_time &lt;= #{param.openTimeEnd}
         </if>
         <if test="param.signTimeStart != null">
             and lsoi.sign_date &gt;= #{param.signTimeStart}

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/impl/StatisticsOrderInfoServiceImpl.java

@@ -143,10 +143,7 @@ public class StatisticsOrderInfoServiceImpl extends BaseServiceImpl<StatisticsOr
 
 
 		// 对advanceDetailDTOList 按照 incomeCategoryName 进分组 并统计数量
-			Map<String, List<AdvanceDetailDTO>> collect = advanceDetailDTOList.stream().collect(Collectors.groupingBy(AdvanceDetailDTO::getIncomeCategoryName));
+			Map<String, List<AdvanceDetailDTO>> collect = advanceDetailDTOList.stream().filter(advanceDetailDTO -> !Objects.isNull(advanceDetailDTO.getIncomeCategoryName())).collect(Collectors.groupingBy(AdvanceDetailDTO::getIncomeCategoryName));
-
-
-
 
 
 			Long orderInfoId = statisticsOrderInfoVO.getOrderInfoId();

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/IOpenOrderService.java

@@ -2,6 +2,7 @@ package com.logpm.trunkline.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.logpm.trunkline.dto.AdvanceDTO;
+import com.logpm.trunkline.dto.CheckWaybillListDTO;
 import com.logpm.trunkline.dto.OpenLabelDTO;
 import com.logpm.trunkline.dto.OpenOrderDTO;
 import com.logpm.trunkline.vo.TrunklineAdvanceDetailVO;
@@ -101,5 +102,12 @@ public interface IOpenOrderService {
 
 	void dealOpenIncoming(Long waybillId,List<Long> advanceIds);
 
+	/**
+	 * 运单批量审核
+	 * @param openOrderDTO
+	 * @return
+	 */
+	R checkWaybillList(CheckWaybillListDTO openOrderDTO);
+
 //	R findWaybillInfo(String waybillNo);
 }