1.干线bug修复

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

@@ -37,6 +37,7 @@ public class LoadCarsDTO implements Serializable {
 	private String deliveryType;
 	private String operator;
 	private String settlementPerson;
+	private String customerType;
 
 	private Long warehouseId;
 	private List<Long> warehouseIds;

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml

@@ -468,6 +468,9 @@
         <if test="param.settlementPerson != null and param.settlementPerson != ''">
             and Locate(#{param.settlementPerson},ltcl.settlement_person) > 0
         </if>
+        <if test="param.customerType != null and param.customerType != ''">
+            and Locate(#{param.customerType},ltcl.customer_type) > 0
+        </if>
 
         <if test="param.createTimeStart != null ">
             and ltcl.create_time &gt;= #{param.createTimeStart}

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.java

@@ -181,4 +181,6 @@ public interface TrunklineCarsLoadScanMapper extends BaseMapper<TrunklineCarsLoa
 	List<UnloadPackageVO> findUnloadZeroListByLoadIdAndFinalNodeId(@Param("loadId") Long loadId, @Param("warehouseId") Long warehouseId);
 
 	List<SignPackageVO> findSignPackageListBySignOrderId(@Param("signOrderId") Long signOrderId);
+
+	List<Long> findAllIdListByLoadIdAndScanStatus(@Param("loadId") Long loadId, @Param("scanStatus") String scanStatus);
 }

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml

@@ -977,4 +977,11 @@
         where  sign_order_id = #{signOrderId}
     </select>
 
+    <select id="findAllIdListByLoadIdAndScanStatus" resultType="java.lang.Long">
+        select id
+        from logpm_trunkline_cars_load_scan
+        where load_id = #{loadId}
+          and scan_status = #{scanStatus}
+    </select>
+
 </mapper>

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

@@ -177,4 +177,6 @@ public interface ITrunklineCarsLoadScanService extends BaseService<TrunklineCars
 	List<UnloadPackageVO> findUnloadZeroListByLoadIdAndFinalNodeId(Long loadId, Long warehouseId);
 
 	List<SignPackageVO> findSignPackageListBySignOrderId(Long signOrderId);
+
+	List<Long> findAllIdListByLoadIdAndScanStatus(Long loadId, String scanStatus);
 }

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java

@@ -155,6 +155,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 		}
 
 		//把list中所有的senderName去重放入一个Set集合
+		Set<String> senderFactorySet = list.stream().filter(e -> StringUtil.isNotBlank(e.getSenderFactory())).map(TrunklineAdvanceEntity::getSenderFactory).collect(Collectors.toSet());
 		Set<String> senderNameSet = list.stream().filter(e -> StringUtil.isNotBlank(e.getSenderName())).map(TrunklineAdvanceEntity::getSenderName).collect(Collectors.toSet());
 		Set<String> senderPhoneSet = list.stream().filter(e -> StringUtil.isNotBlank(e.getSenderPhone())).map(TrunklineAdvanceEntity::getSenderPhone).collect(Collectors.toSet());
 		Set<String> senderAddressSet = list.stream().filter(e -> StringUtil.isNotBlank(e.getSenderAddress())).map(TrunklineAdvanceEntity::getSenderAddress).collect(Collectors.toSet());
@@ -202,6 +203,19 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 				openOrderVO.setDepartureArray(departureArray);
 
 			}
+		}else{
+			if(CollUtil.isNotEmpty(senderFactorySet) && senderFactorySet.size() == 1){
+				openOrderVO.setShipper(senderFactorySet.iterator().next());
+			}
+			if(CollUtil.isNotEmpty(senderNameSet) && senderNameSet.size() == 1){
+				openOrderVO.setShipperName(senderNameSet.iterator().next());
+			}
+			if(CollUtil.isNotEmpty(senderPhoneSet) && senderPhoneSet.size() == 1){
+				openOrderVO.setShipperMobile(senderPhoneSet.iterator().next());
+			}
+			if(CollUtil.isNotEmpty(senderAddressSet) && senderAddressSet.size() == 1){
+				openOrderVO.setShipperAddress(senderAddressSet.iterator().next());
+			}
 		}
 
 

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadScanServiceImpl.java

@@ -17,6 +17,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -454,4 +455,9 @@ public class TrunklineCarsLoadScanServiceImpl extends BaseServiceImpl<TrunklineC
 		return baseMapper.findSignPackageListBySignOrderId(signOrderId);
 	}
 
+	@Override
+	public List<Long> findAllIdListByLoadIdAndScanStatus(Long loadId, String scanStatus) {
+		return baseMapper.findAllIdListByLoadIdAndScanStatus(loadId,scanStatus);
+	}
+
 }

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java

@@ -2607,7 +2607,8 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		}
 
 
-		List<Long> scanLoadIds = trunklineCarsLoadScanService.findAllIdListByLoadIdAndNoScanStatus(loadId,"3");
+//		List<Long> scanLoadIds = trunklineCarsLoadScanService.findAllIdListByLoadIdAndNoScanStatus(loadId,"3");
+		List<Long> scanLoadIds = trunklineCarsLoadScanService.findAllIdListByLoadIdAndScanStatus(loadId,"2");
 
 		return signLoadScanByIds(scanLoadIds,warehouseId);
 

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

@@ -203,4 +203,6 @@ public interface TaskQuestMapper extends BaseMapper<TaskQuestEntity> {
 	List<QuestContrastPackageExcelVO> exportAllDataWithPackage(@Param("param") QuestDetailDTO questDetailDTO);
 
 	List<QuestContrastPackageExcelVO> exportPanDataWithPackage(@Param("param") QuestDetailDTO questDetailDTO);
+
+	void deleteGroundingPosition(@Param("questNum") String questNum, @Param("list") List<QuestDetailEntity> questDetailEntities);
 }

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

@@ -788,4 +788,19 @@
         AND quest_status = 1
     </select>
 
+    <update id="deleteGroundingPosition" >
+        update ${questNum}
+        set grounding_position_code = null,
+            grounding_allocation_id = null,
+            is_new = 0,
+            is_change = 0,
+            is_change_at = 0,
+            quest_status = 0
+        where id in
+        <foreach collection="list" item="item" separator="," open="(" close=")">
+            #{item.id}
+        </foreach>
+    </update>
+
+
 </mapper>

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

@@ -1410,7 +1410,8 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 				questDetailEntities.add(questDetail);
 				baseMapper.deleteQuestChild(taskSearchDTO.getQuestNum() + "_child", i);
 			});
-			baseMapper.updatePositionCodeList(taskSearchDTO.getQuestNum(), questDetailEntities);
+//			baseMapper.updatePositionCodeList(taskSearchDTO.getQuestNum(), questDetailEntities);
+			baseMapper.deleteGroundingPosition(taskSearchDTO.getQuestNum(),questDetailEntities);
 			return R.success("删除成功！！");
 		} else {
 			return R.fail("修改失败！！");