1.干线bug修复

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

@@ -409,13 +409,14 @@
                ltad.material_name materialName
         from logpm_trunkline_cars_order ltco
         left join logpm_trunkline_advance_detail ltad on ltad.order_code = ltco.order_code and ltad.waybill_no = ltco.waybill_no
-        left join logpm_trunkline_cars_load_scan ltcls on ltcls.order_code = ltad.order_code and ltcls.waybill_no = ltad.waybill_no and ltcls.order_package_code = ltad.order_package_code
+        LEFT JOIN (SELECT scan_code FROM logpm_trunkline_cars_load_scan ltcls
+                                    WHERE ltcls.load_id = #{loadId}
+                                                                                AND ltcls.warehouse_id = #{warehouseId}
+                                                                                AND ltcls.type = 1 ) t on t.scan_code = ltad.order_package_code
         where ltco.load_id = #{loadId}
         and ltco.node_id = #{warehouseId}
         and ltco.type = 1
-        and ltcls.load_id = #{loadId}
+        and t.scan_code is null
-        and ltcls.warehouse_id = #{warehouseId}
-        and ltcls.type = 1
     </select>
 
 </mapper>

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

@@ -9635,6 +9635,31 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			}
 		}
 
+		//查询包件是否签收
+		DistributionParcelListEntity signDistributionParcelListEntity = distributionParcelListClient.findOrderPackageCodeAndStatus(orderPackageCode,"70");
+		if (!Objects.isNull(distributionParcelListEntity)) {
+			log.warn("##############unloadPackage: 包件已签收 orderPackageCode={} warehouseId={}", orderPackageCode, warehouseId);
+			return R.fail(405, "包件已签收");
+		}
+
+		QueryWrapper<TrunklineCarsLoadScanEntity> neloadScanQueryWrapper = new QueryWrapper<>();
+		neloadScanQueryWrapper.eq("load_id", loadId)
+			.eq("scan_code", orderPackageCode)
+			.eq("unload_node_id", warehouseId)
+			.ne("scan_status", "1");
+		TrunklineCarsLoadScanEntity scanEntity = trunklineCarsLoadScanService.getOne(neloadScanQueryWrapper);
+
+		if (!Objects.isNull(scanEntity)) {
+			Integer isData1 = scanEntity.getIsData();
+			if (isData1.equals(0)) {
+				log.warn("##############unloadPackage: 系统无编码 orderPackageCode={} warehouseId={}", orderPackageCode, warehouseId);
+				return R.fail(405, "系统无编码");
+			}
+			log.warn("##############unloadPackage: 包件已卸车 orderPackageCode={} warehouseId={}", orderPackageCode, warehouseId);
+			return R.fail(405, "包件已卸车");
+		}
+
+
 		//先判断包件是否在配载计划的装车扫描中
 		QueryWrapper<TrunklineCarsLoadScanEntity> loadScanQueryWrapper = new QueryWrapper<>();
 		loadScanQueryWrapper.eq("load_id", loadId)