Merge branch 'dev' into pre-production

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataDriverArteryEntity.java

@@ -62,7 +62,7 @@ public class BasicdataDriverArteryEntity extends TenantEntity {
 	/**
 	 * 职务类型;1-干线,2-配送
 	 */
-	@ApiModelProperty(value = "职务类型;1-干线,2-配送,3-全部")
+	@ApiModelProperty(value = "职务类型;1-干线,2-配送")
 	private String jobType;
 	/**
 	 * 准驾车型;1-A1,2-A2,3-A3,4-B1,5-B2,6-C1,7-C2

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataDriverArteryVO.java

@@ -50,6 +50,12 @@ public class BasicdataDriverArteryVO extends BasicdataDriverArteryEntity {
 	@ApiModelProperty(value = "司机关联车辆列表")
 	private List<BasicdataVehicleEntity> vehicleVOList;
 
+	/**
+	 * 司机类型
+	 */
+	private List<String> jobTypeString;
+
+
 
 	private List<BasicdataDriverWarehouseVO> warehouses = new ArrayList<>();
 

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

@@ -12,6 +12,7 @@ public class ZeroSuppleVO implements Serializable {
 	private String orderCode;
 	private Integer enterNum;//输入数量
 	private Long finalNodeId;//目的仓id
+	private Long signOrderId;//签收单id
 
 
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataDriverArteryController.java

@@ -34,6 +34,7 @@ import com.logpm.basicdata.vo.BasicdataDriverWarehouseVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import jodd.util.ArraysUtil;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.boot.ctrl.BladeController;
@@ -54,10 +55,7 @@ import springfox.documentation.annotations.ApiIgnore;
 
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * 司机信息表 控制器
@@ -95,6 +93,11 @@ public class BasicdataDriverArteryController extends BladeController {
 		List<BasicdataDriverWarehouseVO> warehouseIds = basicdataDriverWarehouseService.findByDriverId(driverId);
 		BasicdataDriverArteryVO basicdataDriverArteryVO = new BasicdataDriverArteryVO();
 		BeanUtil.copy(detail,basicdataDriverArteryVO);
+
+		// 拆分 司机类型
+		String[] split = basicdataDriverArteryVO.getJobType().split(",");
+		List<String> list = Arrays.asList(split);
+		basicdataDriverArteryVO.setJobTypeString(list);
 		basicdataDriverArteryVO.setWarehouses(warehouseIds);
 		basicdataDriverArteryVO.setBindVehicles(String.join(",",vehicleIds));
 		return R.data(basicdataDriverArteryVO);

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataDriverArteryDTO.java

@@ -41,4 +41,6 @@ public class BasicdataDriverArteryDTO extends BasicdataDriverArteryEntity {
 	private String  bindVehicles;
 
 	private List<Long> warehouseIds = new ArrayList<>();
+
+
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataDriverArteryMapper.java

@@ -69,7 +69,7 @@ public interface BasicdataDriverArteryMapper extends BaseMapper<BasicdataDriverA
 	 */
 	BasicdataDriverArteryEntity findDriverListByPhone(@Param("name") String vehicleOwner,@Param("phone") String vehicleOwnerPhone);
 
-    List<BasicdataDriverArteryEntity> selectListByWarehouseId(@Param("warehouseId") Long warehouseId);
+    List<BasicdataDriverArteryEntity> selectListByWarehouseId(@Param("warehouseId") Long warehouseId,@Param("jobType")String jobType);
 
 	BasicdataDriverArteryEntity findEntityByPhone(@Param("phone") String phone);
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataDriverArteryMapper.xml

@@ -168,13 +168,12 @@
         left join logpm_basicdata_vehicle lbv on lbv.id = lbdm.brand_id
         where lbda.`name` like concat('%',#{driverName},'%')
         <if test="jobType != null and jobType = ''">
-            and lbda.job_type = #{jobType}
+            and locate(#{jobType},lbda.job_type)>0
         </if>
         group by lbda.id,
                lbda.name,
                lbda.phone,
                lbda.type
-        limit 10
     </select>
     <select id="findDriverListByPhone" resultType="com.logpm.basicdata.entity.BasicdataDriverArteryEntity">
         SELECT id,name,bind_vehicle FROM logpm_basicdata_driver_artery WHERE name = #{name} AND phone = #{phone}
@@ -186,6 +185,7 @@
         from logpm_basicdata_driver_artery lbda
         left join logpm_basicdata_driver_warehouse lbdw on lbdw.driver_id = lbda.id
         where lbdw.warehouse_id = #{warehouseId}
+        and  locate(${jobType},lbda.job_type)>0
         and lbda.is_deleted = 0
     </select>
 

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataDriverArteryServiceImpl.java

@@ -140,7 +140,7 @@ public class BasicdataDriverArteryServiceImpl extends BaseServiceImpl<BasicdataD
 		log.info("################ getDriverList 仓库信息:{}", myCurrentWarehouse);
 		Long warehouseId = myCurrentWarehouse.getId();
 		ArrayList<BasicdataDriverArteryVO> basicdataDriverArteryVOS = new ArrayList<>();
-		List<BasicdataDriverArteryEntity> list = baseMapper.selectListByWarehouseId(warehouseId);
+		List<BasicdataDriverArteryEntity> list = baseMapper.selectListByWarehouseId(warehouseId,"2");
 		log.info("################getDriverList list:{}", list);
 
 		if(list.isEmpty()){

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

@@ -6528,21 +6528,21 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 						}
 					}
 
-					if (distributionReservationEntity.getReservationStockListNum() > 0) {
-
-						//查询库存品扫描签收
-						List<SignPushDataUnitDTO> loadingPushOldInventory = distributionSignforMapper.selectLoadingPushOldInventory(distributionSignforEntity.getReservationId(), distributionSignforEntity.getDeliveryId());
-						List<SignPushDataUnitDTO> signingPushOldInventory = distributionSignforMapper.selectSigningPushOldInventory(distributionSignforEntity.getReservationId(), distributionSignforEntity.getDeliveryId());
-						if (Func.isNotEmpty(loadingPushOldInventory)) {
-							buildNameAndPhone(loadingPushOldInventory);
-							signPushDataUnitDTOS.addAll(loadingPushOldInventory);
-						}
-
-						if (Func.isNotEmpty(signingPushOldInventory)) {
-							buildNameAndPhone(signingPushOldInventory);
-							signPushDataUnitDTOS.addAll(signingPushOldInventory);
-						}
-					}
+//					if (distributionReservationEntity.getReservationStockListNum() > 0) {
+//
+//						//查询库存品扫描签收
+//						List<SignPushDataUnitDTO> loadingPushOldInventory = distributionSignforMapper.selectLoadingPushOldInventory(distributionSignforEntity.getReservationId(), distributionSignforEntity.getDeliveryId());
+//						List<SignPushDataUnitDTO> signingPushOldInventory = distributionSignforMapper.selectSigningPushOldInventory(distributionSignforEntity.getReservationId(), distributionSignforEntity.getDeliveryId());
+//						if (Func.isNotEmpty(loadingPushOldInventory)) {
+//							buildNameAndPhone(loadingPushOldInventory);
+//							signPushDataUnitDTOS.addAll(loadingPushOldInventory);
+//						}
+//
+//						if (Func.isNotEmpty(signingPushOldInventory)) {
+//							buildNameAndPhone(signingPushOldInventory);
+//							signPushDataUnitDTOS.addAll(signingPushOldInventory);
+//						}
+//					}
 					//查询签收图片
 					List<DistributionSignPrintVO> distributionSignPrintVOS = distributionSignforMapper.selectSignImgsUrl(distributionReservationEntity.getId());
 

blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/DistributionDatarepair.java

@@ -236,14 +236,22 @@ public class DistributionDatarepair {
 		}
 		List<JSONObject> allSignfor = warehouseMappingDataMapper.findAllBillSign(parmeId);
 		for (JSONObject entries : allSignfor) {
-			Long id = entries.getLong("billId");
-			Boolean b =distrilbutionBillLadingClient.clerkBillCheckPushData(id);
-			if(b!=null&&b){
-				warehouseMappingDataMapper.updateClearBillSignforStatus(entries.getLong("id"), entries.getLong("warehouseId"), 1);
-				log.info(">>> pushBillNotification 成功 id={}",id);
-			}else{
-				log.error(">>> pushBillNotification 失败 id="+id);
+			try {
+				Long id = entries.getLong("billId");
+				Boolean b =distrilbutionBillLadingClient.clerkBillCheckPushData(id);
+				if(b!=null&&b){
+					warehouseMappingDataMapper.updateClearBillSignforStatus(entries.getLong("id"), entries.getLong("warehouseId"), 1);
+					log.info(">>> pushBillNotification 成功 id={}",id);
+				}else{
+					log.error(">>> pushBillNotification 失败 id="+id);
+				}
+				Thread.sleep(1000*60);
+			} catch (InterruptedException e) {
+				throw new RuntimeException(e);
+			} finally {
+				log.error(">>> pushBillNotification 释放");
 			}
+
 		}
 		return ReturnT.SUCCESS;
 	}

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

@@ -52,7 +52,7 @@
             and ltcl.load_status = #{param.loadStatus}
         </if>
         <if test="param.warehouseName != null and param.warehouseName != ''">
-            and (Locate(#{param.warehouseName},ltcl.start_warehouse_name) > 0 or Locate(#{param.warehouseName},ltcl.end_warehouse_name) > 0)
+            and (Locate(#{param.warehouseName},ltcl.start_warehouse_name) > 0 or Locate(#{param.warehouseName},ltcl.end_warehouse_names) > 0)
         </if>
         <if test="param.createTimeStart != null ">
             and ltcl.create_time &gt;= #{param.createTimeStart}
@@ -135,6 +135,9 @@
         <if test="param.warehouseId != null" >
             and ltcl.end_warehouse_ids like concat('%',#{param.warehouseId},'%')
         </if>
+        <if test="param.warehouseName != null and param.warehouseName != ''">
+            and (Locate(#{param.warehouseName},ltcl.start_warehouse_name) > 0 or Locate(#{param.warehouseName},ltcl.end_warehouse_names) > 0)
+        </if>
         <if test="param.loadCarsNo != null and param.loadCarsNo != ''">
             and Locate(#{param.loadCarsNo},ltcl.cars_no) > 0
         </if>
@@ -561,13 +564,19 @@
                IFNULL(lww.total_freight,0) totalFreight,
                lww.total_count,
                lww.remark remark,
-               ROUND(lww.total_freight/lww.total_count,2) price
+               ROUND(lww.total_freight/lww.total_count,2) price,
+               ltlso.load_sign_code loadSignCode,
+               ltlso.id signOrderId
         from logpm_distribution_stock_article ldsa
         left join logpm_warehouse_waybill lww on lww.waybill_no = ldsa.waybill_number
+        left join logpm_trunkline_load_sign_order ltlso on ltlso.mall_name = ldsa.mall_name and ltlso.load_id = #{param.loadId}
         where ldsa.is_zero = 1
           and lww.destination_warehouse_id != #{param.warehouseId}
           and ldsa.hand_quantity > 0
           and ldsa.warehouse_id = #{param.warehouseId}
+          <if test="param.type != null and param.type == 1">
+              and ltlso.id is not null
+          </if>
           <if test="param.orderCodes != null and param.orderCodes.size() > 0">
             and ldsa.order_code not in
             <foreach collection="param.orderCodes" item="item" open="(" separator="," close=")">

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

@@ -2880,7 +2880,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			distributionStockArticleClient.submitHandleNumByOrderId(difficult, articleId);
 		}
 
-		audio = (realLoadingNumber+enterNum)+"件";
+		audio = (enterNum)+"件";
 
 		trunklineCarsLoadingLogService.savaLoadingLog(warehouseId, warehouseName, loadId, loadCode, waybillId, waybillNo, orderCode, goodsName, difficult,
 			2, isData, isAbnormal, trayId, trayCode, trayName, fromWarehouseId, loadScanId, remark);
@@ -3412,6 +3412,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			String orderCode = zeroSuppleVO.getOrderCode();
 			Integer enterNum = zeroSuppleVO.getEnterNum();
 			Long finalNodeId = zeroSuppleVO.getFinalNodeId();
+			Long signOrderId = zeroSuppleVO.getSignOrderId();
 
 			WarehouseWaybillEntity warehouseWaybillEntity = warehouseWaybillClient.findByWaybillNo(waybillNo);
 			if (Objects.isNull(warehouseWaybillEntity)) {
@@ -3452,11 +3453,24 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			carsLoadScanEntity.setUnloadCheck(0);
 			carsLoadScanEntity.setLoadingUserName(AuthUtil.getNickName());
 			carsLoadScanEntity.setIsSupple(1);
+			carsLoadScanEntity.setSignOrderId(signOrderId);
 			trunklineCarsLoadScanService.save(carsLoadScanEntity);
 
 			zeroStockArticleEntity.setHandQuantity(zeroStockArticleEntity.getHandQuantity() - enterNum);
 
 			distributionStockArticleClient.saveOrUpdate(zeroStockArticleEntity);
+
+			if(!Objects.isNull(signOrderId)){
+				updateSignOrderNumBySignOrderId(signOrderId);
+//				TrunklineLoadSignOrderEntity signOrderEntity = trunklineLoadSignOrderService.getById(signOrderId);
+//				signOrderEntity.setPlanNum(signOrderEntity.getPlanNum() + enterNum);
+//				signOrderEntity.setLoadingNum(signOrderEntity.getLoadingNum() + enterNum);
+//				Integer signNum = signOrderEntity.getSignNum();
+//				if(signNum > 0 ){
+//					signOrderEntity.setSignStatus("10");
+//				}
+//				trunklineLoadSignOrderService.updateById(signOrderEntity);
+			}
 		}
 		//更新数量
 		updateNumByLoadId(loadId);
@@ -5228,10 +5242,10 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			return R.fail(405, "零担已卸车");
 		}
 
-		if ("3".equals(scanStatus)) {
-			log.warn("##############signZeroOrder: 零担已签收 carsLoadScanId={} scanStatus={}", carsLoadScanId, scanStatus);
-			return R.fail(405, "零担已签收");
-		}
+//		if ("3".equals(scanStatus)) {
+//			log.warn("##############signZeroOrder: 零担已签收 carsLoadScanId={} scanStatus={}", carsLoadScanId, scanStatus);
+//			return R.fail(405, "零担已签收");
+//		}
 
 
 		Long wid = carsLoadScanEntity.getWarehouseId();
@@ -5240,6 +5254,12 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			return R.fail(405, "包件不在签收计划中");
 		}
 
+		Integer num = carsLoadScanEntity.getNum();
+		if(enterNum > num){
+			log.warn("##############signScanPackageCode: 签收数量不能大于当前数据的装车数量 num={} enterNum={}", num, enterNum);
+			return R.fail(405, "签收数量不能大于当前数据的装车数量");
+		}
+
 		carsLoadScanEntity.setScanStatus("3");
 		carsLoadScanEntity.setUnloadNum(enterNum);
 		carsLoadScanEntity.setUnloadAbnormal(0);
@@ -6002,11 +6022,27 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 
 		}else{
 			//直发商家签收单
+			signOrderEntity.setSignStatus("30");
+			//处理零担的数据
+			QueryWrapper<TrunklineCarsLoadScanEntity> queryWrapper = new QueryWrapper<>();
+			queryWrapper.eq("sign_order_id",signOrderId)
+					.eq("type",2)
+					.eq("scan_status","3");
 
-
+			List<TrunklineCarsLoadScanEntity> carsLoadScanEntityList = trunklineCarsLoadScanService.list(queryWrapper);
+			carsLoadScanEntityList.forEach(carsLoadScanEntity -> {
+				Integer num = carsLoadScanEntity.getNum();
+				Integer unloadNum = carsLoadScanEntity.getUnloadNum();
+				String orderCode = carsLoadScanEntity.getOrderCode();
+				Long fromWarehouseId = carsLoadScanEntity.getFromWarehouseId();
+				if(unloadNum != num){
+					int diff = num - unloadNum;
+					DistributionStockArticleEntity stockArticle = distributionStockArticleClient.findZeroByOrderCodeAndWarehouseId(orderCode, fromWarehouseId);
+					distributionStockArticleClient.addHandQuantity(stockArticle.getId(), diff);
+				}
+			});
+			trunklineLoadSignOrderService.updateById(signOrderEntity);
 		}
-
-
 		return R.success("添加成功");
 	}