Merge branch 'dev' into pre-production

blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineBillladingWaybillVO.java

@@ -33,5 +33,6 @@ public class TrunklineBillladingWaybillVO extends TrunklineBillladingWaybillEnti
 
 	private Long billladingWaybillId;
 	private Integer totalPlanNum;
+	private Integer scanNum;
 
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataVehicleClient.java

@@ -63,6 +63,20 @@ public class BasicdataVehicleClient implements IBasicdataVehicleClient {
 	public List<JSONObject> findCarListByName(String carNumber) {
 		List<BasicdataVehicleEntity> ls = basicdataVehicleService.findCarListByName(carNumber);
 		List<JSONObject> list = new ArrayList<>();
+		ls.forEach(vehicleEntity -> {
+			JSONObject jsonObject = new JSONObject();
+			jsonObject.put("carId",vehicleEntity.getId());
+			jsonObject.put("carNumber",vehicleEntity.getVehicleNub());
+			String vehicleSource = vehicleEntity.getVehicleSource();
+			if("3".equals(vehicleSource)){
+				jsonObject.put("isOut",1);
+			}else{
+				jsonObject.put("isOut",0);
+			}
+			list.add(jsonObject);
+		});
+
+
 		for (BasicdataVehicleEntity vehicleEntity:ls){
 			JSONObject jsonObject = new JSONObject();
 			jsonObject.put("carId",vehicleEntity.getId());

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml

@@ -1260,10 +1260,10 @@
             and ldsa.order_status in ('70','80')
 
             <if test="collect != null and @org.apache.commons.collections4.CollectionUtils@isNotEmpty(collect)">
-                and ldsa.warehouse_id in
-                <foreach collection="collect" item="item" open="(" close=")" separator=",">
-                    #{item}
-                </foreach>
+<!--                and ldsa.warehouse_id in-->
+<!--                <foreach collection="collect" item="item" open="(" close=")" separator=",">-->
+<!--                    #{item}-->
+<!--                </foreach>-->
                 and ldl.warehouse_id in
                 <foreach collection="collect" item="item" open="(" close=")" separator=",">
                     #{item}
@@ -1386,6 +1386,10 @@
         LEFT JOIN logpm_distrilbution_bill_lading AS ldbl ON ldbls.bill_lading_id = ldbl.id
         <where>
             ldsa.order_status in ('70','80')
+            and ldbls.warehouse_id in
+            <foreach collection="collect" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
             <if test="param.waybillNumber != null and param.waybillNumber != ''">
                 AND ldsa.waybill_number like concat(#{param.waybillNumber},"%")
             </if>

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

@@ -2611,12 +2611,13 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 		BasicdataWarehouseEntity currentWarehouse = warehouseClient.getMyCurrentWarehouse();
 		List<Long> collect = null;
 
-		if(ObjectUtils.isNotNull(myWarehouseList)){
+		if(ObjectUtils.isNotNull(currentWarehouse)){
 			collect = new ArrayList<>();
 			collect.add(currentWarehouse.getId());
 		}else{
 			collect = myWarehouseList.stream().map(BasicdataWarehouseEntity::getId).collect(Collectors.toList());
 		}
+		log.info(">>>>>>>>>>>>>当前仓库:{}",collect);
 		IPage<DistributionSignforStockArticleVO> distributionStockArticleEntityIPage = baseMapper.pageSignforListOwe(page, stockArticleEntity,collect);
 		//处理创建人
 		distributionStockArticleEntityIPage.getRecords().forEach(a -> {

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

@@ -453,7 +453,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 					.eq(DistributionDeliveryDetailsEntity::getBillLadingId, distrilbutionBillLading.getId())
 					.ne(DistributionDeliveryDetailsEntity::getInventoryStatus, "2")
 				);
-				Map<Long, List<DistributionDeliveryDetailsEntity>> map = null;
+				Map<Long, List<DistributionDeliveryDetailsEntity>> map = new HashMap<>();
 				if (!listDetails.isEmpty()) {
 					map = listDetails.stream().collect(Collectors.groupingBy(DistributionDeliveryDetailsEntity::getStockListId));
 				}

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

@@ -1460,6 +1460,12 @@ public class SyncOrderInfoServiceImpl implements ISyncOrderInfoService {
 			log.warn("#################saveOrderInfo: 运单信息为空 orderCode={}",orderCode);
 			throw new CustomerException(403,"运单信息为空");
 		}
+		Integer warehouseId = wayBillEntity.getWarehouseId();
+		if(!warehouseId.equals(oldWarehouseId)){
+			log.warn("#################saveOrderInfo: 包件还未到达目的仓,不同步 warehouseId={} oldWarehouseId={}",warehouseId,oldWarehouseId);
+			throw new CustomerException(403,"包件还未到达目的仓,不同步");
+		}
+
 
 		BasicdataWarehouseEntity basicdataWarehouseEntity = basicdataWarehouseClient.getEntityWarehouseId(newWarehouseId);
 		if(Objects.isNull(basicdataWarehouseEntity)){

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

@@ -22,8 +22,8 @@
 
     <select id="findWaybillInfoListByBillladingId" resultType="com.logpm.trunkline.vo.TrunklineBillladingWaybillVO">
         select ltb.billlading_code billadingCode,
-               ltbw.waybill_id waybillId,
-               ltbw.waybill_no waybillNo,
+               ltad.waybill_id waybillId,
+               ltad.waybill_no waybillNo,
                ltbw.id billladingWaybillId,
                lww.create_time openOrderTime,
                lww.goods_name goodsName,
@@ -44,12 +44,18 @@
                ltbw.plan_num planNum,
                ltbw.real_num realNum,
                ltbw.billlading_fee billladingFee,
-               lww.collect_pay collectPay
+               lww.collect_pay collectPay,
+               count(ltad.id) scanNum
         from logpm_trunkline_billlading_waybill ltbw
+         left join logpm_trunkline_billlading_package ltbp on ltbw.billlading_id = ltbp.billlading_id
+         left join logpm_trunkline_advance_detail ltad on ltad.order_package_code = ltbp.order_package_code and ltad.waybill_id = ltbw.waybill_id
          left join logpm_trunkline_billlading ltb on ltb.id = ltbw.billlading_id
          left join logpm_warehouse_waybill lww on lww.waybill_no = ltbw.waybill_no
         where ltbw.billlading_id = #{billladingId}
         and ltbw.is_deleted = 0
+        group by ltb.billlading_code,
+                 ltbw.waybill_id,
+                 ltbw.waybill_no
     </select>
 
     <update id="updateDataByBillladingWaybillId" >

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

@@ -2712,8 +2712,8 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 
 		Date start = CommonUtil.getStartByDateStr(loadCarsDTO.getStartDate());
 		Date end = CommonUtil.getEndByDateStr(loadCarsDTO.getEndDate());
-		loadCarsDTO.setStartDate(CommonUtil.dateToStringGeneral(start));
-		loadCarsDTO.setEndDate(CommonUtil.dateToStringGeneral(end));
+		loadCarsDTO.setStartTime(start);
+		loadCarsDTO.setEndTime(end);
 
 		IPage<TrunklineCarsLoadVO> pageList = baseMapper.carsLoadPageList(page, loadCarsDTO);
 		List<TrunklineCarsLoadVO> records = pageList.getRecords();

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

@@ -984,6 +984,7 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
 		map.put("orderCode",parcelListEntity.getOrderCode());
 		map.put("orderPackageCode",orderPackageCode);
 		map.put("trayName",trayName);
+		map.put("trayWarehouseId",trayWarehouseId);
 		map.put("trayWarehouseName",trayWarehouseName);
 
 		return R.data(map);

pom.xml

@@ -163,12 +163,12 @@
                                 <goal>run</goal>
                             </goals>
                             <configuration>
-                                <tasks>
+                                <target>
                                     <!--suppress UnresolvedMavenProperty -->
                                     <copy overwrite="true"
                                           tofile="${session.executionRootDirectory}/target/${project.artifactId}.jar"
                                           file="${project.build.directory}/${project.artifactId}.jar"/>
-                                </tasks>
+                                </target>
                             </configuration>
                         </execution>
                     </executions>