1.司机信息-新增，编辑逻辑更新

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

@@ -26,6 +26,7 @@ public class AdvanceDTO implements Serializable {
 	private String freezeStatus;
 
 	//列表查询参数
+	private String htMallName;
 	private String orderCode;
 	private String dealerName;
 	private String dealerCode;

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

@@ -3,6 +3,7 @@ package com.logpm.trunkline.dto;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.List;
 
 @Data
 public class InComingDTO implements Serializable {
@@ -13,10 +14,14 @@ public class InComingDTO implements Serializable {
 
 	private Long warehouseId;//仓库id
 	private String warehouseName;//仓库
-	private Integer incomingType;//入库类型
+	private Integer incomingType;//入库类型 1提货扫描入库 2直接入库  3批量入库  4 按车次号入库   5按订单入库
 
 	private String trayCode;//托盘码
 
 	private String trayType;//打托方式
 
+	private String incomingCode;//入库码
+
+	private List<Long> advanceIds;//暂存单ids
+
 }

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

@@ -14,4 +14,6 @@ public class TrunklineAdvanceVO extends TrunklineAdvanceEntity {
 
 	private List<TrunklineAdvanceDetailEntity> detailList = new ArrayList<>();
 
+	private Integer isIncoming;
+
 }

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

@@ -27,6 +27,7 @@ import com.logpm.basicdata.excel.BasicdataDriverArteryImporter;
 import com.logpm.basicdata.excel.BasicdataDriverArteryImproterExcel;
 import com.logpm.basicdata.service.IBasicdataDriverArteryService;
 import com.logpm.basicdata.service.IBasicdataDriverWarehouseService;
+import com.logpm.basicdata.service.IBasicdataDrivermiddleService;
 import com.logpm.basicdata.service.IBasicdataVehicleService;
 import com.logpm.basicdata.vo.BasicdataDriverArteryVO;
 import com.logpm.basicdata.vo.BasicdataDriverWarehouseVO;
@@ -79,6 +80,8 @@ public class BasicdataDriverArteryController extends BladeController {
 
 	private final IBasicdataDriverWarehouseService basicdataDriverWarehouseService;
 
+	private final IBasicdataDrivermiddleService basicdataDrivermiddleService;
+
 	/**
 	 * 司机信息表 详情
 	 */
@@ -88,10 +91,12 @@ public class BasicdataDriverArteryController extends BladeController {
 	public R<BasicdataDriverArteryEntity> detail(BasicdataDriverArteryEntity basicdataDriverArtery) {
 		BasicdataDriverArteryEntity detail = basicdataDriverArteryService.getOne(Condition.getQueryWrapper(basicdataDriverArtery));
 		Long driverId = detail.getId();
+		List<String> vehicleIds = basicdataDrivermiddleService.findVehicleIdsByDriverId(driverId);
 		List<BasicdataDriverWarehouseVO> warehouseIds = basicdataDriverWarehouseService.findByDriverId(driverId);
 		BasicdataDriverArteryVO basicdataDriverArteryVO = new BasicdataDriverArteryVO();
 		BeanUtil.copy(detail,basicdataDriverArteryVO);
 		basicdataDriverArteryVO.setWarehouses(warehouseIds);
+		basicdataDriverArteryVO.setBindVehicles(String.join(",",vehicleIds));
 		return R.data(basicdataDriverArteryVO);
 	}
 	/**

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

@@ -52,4 +52,5 @@ public interface BasicdataDrivermiddleMapper extends BaseMapper<BasicdataDriverm
 	 */
 	List<BasicdataDrivermiddleExcel> exportBasicdataDrivermiddle(@Param("ew") Wrapper<BasicdataDrivermiddleEntity> queryWrapper);
 
+    List<Long> findVehicleIdsByDriverId(@Param("driverId") Long driverId);
 }

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

@@ -33,4 +33,11 @@
         SELECT * FROM logpm_basicdata_drivermiddle ${ew.customSqlSegment}
     </select>
 
+    <select id="findVehicleIdsByDriverId" resultType="Long">
+        select brand_id
+        from logpm_basicdata_drivermiddle
+        where driver_id = #{driverId}
+        and is_deleted = 0
+    </select>
+
 </mapper>

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataDrivermiddleService.java

@@ -50,4 +50,6 @@ public interface IBasicdataDrivermiddleService extends BaseService<BasicdataDriv
 	 */
 	List<BasicdataDrivermiddleExcel> exportBasicdataDrivermiddle(Wrapper<BasicdataDrivermiddleEntity> queryWrapper);
 
+    List<String> findVehicleIdsByDriverId(Long driverId);
+
 }

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

@@ -26,6 +26,7 @@ import com.logpm.basicdata.vo.BasicdataDrivermiddleVO;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -52,4 +53,14 @@ public class BasicdataDrivermiddleServiceImpl extends BaseServiceImpl<BasicdataD
 		return basicdataDrivermiddleList;
 	}
 
+	@Override
+	public List<String> findVehicleIdsByDriverId(Long driverId) {
+		List<Long> vehicleIdsByDriverId = baseMapper.findVehicleIdsByDriverId(driverId);
+		List<String> vehicleIds = new ArrayList<>();
+		for (Long aLong : vehicleIdsByDriverId) {
+			vehicleIds.add(aLong.toString());
+		}
+		return vehicleIds;
+	}
+
 }

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/IncomingController.java

@@ -0,0 +1,106 @@
+package com.logpm.trunkline.controller;
+
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
+import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
+import com.logpm.trunkline.dto.InComingDTO;
+import com.logpm.trunkline.service.IInComingService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.common.exception.CustomerException;
+import org.springblade.core.tool.api.R;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Objects;
+
+@Slf4j
+@RestController
+@AllArgsConstructor
+@RequestMapping("/incoming")
+@Api(value = "包件入库控制类", tags = "PC入库接口")
+public class IncomingController {
+
+	private final IBasicdataWarehouseClient warehouseClient;
+
+	private final IInComingService inComingService;
+
+
+	@ResponseBody
+	@PostMapping("/findIncomingOrderList")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "查询入库订单明细", notes = "传入inComingDTO")
+	public R findIncomingOrderList(@RequestBody InComingDTO inComingDTO) {
+		String method = "############findIncomingOrderList: ";
+		log.info(method+"请求参数{}",inComingDTO);
+		Integer incomingType = inComingDTO.getIncomingType();
+
+		try{
+			BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
+			if(Objects.isNull(myCurrentWarehouse)){
+				log.warn(method+"当前仓库信息为空");
+				return R.fail(405,"请先选择仓库");
+			}
+			inComingDTO.setWarehouseId(myCurrentWarehouse.getId());
+			inComingDTO.setWarehouseName(myCurrentWarehouse.getName());
+
+			if(Objects.isNull(incomingType)){
+				log.warn(method+"入库方式不能为空 incomingType={}",incomingType);
+				return R.fail(405,"入库方式不能为空");
+			}
+
+			if(incomingType < 4){
+				log.warn(method+"入库方式不正确 incomingType={}",incomingType);
+				return R.fail(405,"入库方式不正确");
+			}
+			return inComingService.findIncomingOrderList(inComingDTO);
+		}catch (CustomerException e){
+			log.error(e.message,e);
+			return R.fail(e.code,e.message);
+		}catch (Exception e){
+			log.error(method+"系统异常",e);
+			return R.fail(500,"系统异常");
+		}
+	}
+
+	@ResponseBody
+	@PostMapping("/incomingBatchOrder")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "查询入库订单明细", notes = "传入inComingDTO")
+	public R incomingBatchOrder(@RequestBody InComingDTO inComingDTO) {
+		String method = "############incomingBatchOrder: ";
+		log.info(method+"请求参数{}",inComingDTO);
+		Integer incomingType = inComingDTO.getIncomingType();
+
+		try{
+			BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
+			if(Objects.isNull(myCurrentWarehouse)){
+				log.warn(method+"当前仓库信息为空");
+				return R.fail(405,"请先选择仓库");
+			}
+			inComingDTO.setWarehouseId(myCurrentWarehouse.getId());
+			inComingDTO.setWarehouseName(myCurrentWarehouse.getName());
+
+			if(Objects.isNull(incomingType)){
+				log.warn(method+"入库方式不能为空 incomingType={}",incomingType);
+				return R.fail(405,"入库方式不能为空");
+			}
+
+			if(incomingType < 4){
+				log.warn(method+"入库方式不正确 incomingType={}",incomingType);
+				return R.fail(405,"入库方式不正确");
+			}
+			return inComingService.incomingBatchOrder(inComingDTO);
+		}catch (CustomerException e){
+			log.error(e.message,e);
+			return R.fail(e.code,e.message);
+		}catch (Exception e){
+			log.error(method+"系统异常",e);
+			return R.fail(500,"系统异常");
+		}
+	}
+
+
+
+}

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/OpenOrderController.java

@@ -1539,4 +1539,31 @@ public class OpenOrderController {
 	}
 
 
+	@ResponseBody
+	@PostMapping("/findUpdateWaybillList")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "查询改单列表", notes = "传入openOrderDTO")
+	public R findUpdateWaybillList(@RequestBody OpenOrderDTO openOrderDTO) {
+		String method = "############findUpdateWaybillList: ";
+		log.info(method + "请求参数{}", openOrderDTO);
+		Long waybillId = openOrderDTO.getWaybillId();
+		try{
+
+			if(Objects.isNull(waybillId)){
+				log.warn(method+"运单id为空 waybillId={}",waybillId);
+				return R.fail(405,"运单id为空");
+			}
+
+			return openOrderService.findWaybillReturnList(waybillId);
+		}catch (CustomerException e){
+			log.error(e.message,e);
+			return R.fail(e.code,e.message);
+		}catch (Exception e){
+			log.error(method+"系统异常",e);
+			return R.fail(500,"系统异常");
+		}
+	}
+
+
+
 }

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

@@ -43,4 +43,6 @@ public interface TrunklineAdvanceDetailMapper extends BaseMapper<TrunklineAdvanc
 	void updateWaybillNoByAdvanceId(@Param("advanceId") Long advanceId, @Param("waybillNo") String waybillNo, @Param("waybillId") Long waybillId);
 
     List<String> findIncomingWarehouseName(@Param("advanceId") Long advanceId);
+
+    List<String> findNoIncomingPackageCode(@Param("advanceId") Long advanceId);
 }

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

@@ -180,4 +180,11 @@
         group by incoming_warehouse_name
     </select>
 
+    <select id="findNoIncomingPackageCode" resultType="String">
+        select order_package_code
+        from logpm_trunkline_advance_detail
+        where advance_id = #{advanceId}
+        and package_status = '0'
+    </select>
+
 </mapper>

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

@@ -3,6 +3,7 @@ package com.logpm.trunkline.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.logpm.trunkline.dto.AdvanceDTO;
+import com.logpm.trunkline.dto.InComingDTO;
 import com.logpm.trunkline.entity.TrunklineAdvanceEntity;
 import com.logpm.trunkline.vo.CustomerInfoVO;
 import com.logpm.trunkline.vo.OpenOrderVO;
@@ -32,4 +33,7 @@ public interface TrunklineAdvanceMapper extends BaseMapper<TrunklineAdvanceEntit
 	void subTotalNumByAdvanceId(@Param("advanceId") Long advanceId);
 
     void updateIncomingWarehouseName(@Param("incomingWarehouseName") String incomingWarehouseName, @Param("advanceId") Long advanceId);
+
+	List<TrunklineAdvanceVO> findIncomingOrderList(@Param("param") InComingDTO inComingDTO);
+
 }

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

@@ -137,4 +137,19 @@
         and id = #{advanceId}
     </update>
 
+    <select id="findIncomingOrderList" resultType="com.logpm.trunkline.vo.TrunklineAdvanceVO">
+        select lta.*,
+                IF(count(ltad.id)>0,1,0) isIncoming
+        from logpm_trunkline_advance lta
+        left join logpm_trunkline_advance_detail ltad on ltad.advance_id = lta.id and ltad.package_status = '0'
+        WHERE 1=1
+          and lta.warehouse_id = #{param.warehouseId}
+        <if test="param.incomingType == '4'" >
+            and lta.train_number = #{param.incomingCode}
+        </if>
+        <if test="param.incomingType == '5'" >
+            and lta.order_code = #{param.incomingCode}
+        </if>
+    </select>
+
 </mapper>

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

@@ -7,4 +7,8 @@ public interface IInComingService {
 
 	R incomingPackage(InComingDTO inComingDTO);
 
+    R findIncomingOrderList(InComingDTO inComingDTO);
+
+	R incomingBatchOrder(InComingDTO inComingDTO);
+
 }

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

@@ -54,4 +54,5 @@ public interface ITrunklineAdvanceDetailService extends BaseService<TrunklineAdv
 
 	List<String> findIncomingWarehouseName(Long advanceId);
 
+    List<String> findNoIncomingPackageCode(Long advanceId);
 }

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineAdvanceService.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.InComingDTO;
 import com.logpm.trunkline.entity.TrunklineAdvanceDetailEntity;
 import com.logpm.trunkline.entity.TrunklineAdvanceEntity;
 import com.logpm.trunkline.vo.CustomerInfoVO;
@@ -33,4 +34,5 @@ public interface ITrunklineAdvanceService extends BaseService<TrunklineAdvanceEn
 
     void updateIncomingWarehouseName(String incomingWarehouseName, Long advanceId);
 
+	List<TrunklineAdvanceVO> findIncomingOrderList(InComingDTO inComingDTO);
 }

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

@@ -11,6 +11,7 @@ import com.logpm.trunkline.service.IInComingService;
 import com.logpm.trunkline.service.ITrunklineAdvanceDetailService;
 import com.logpm.trunkline.service.ITrunklineAdvanceService;
 import com.logpm.trunkline.service.ITrunklineBillladingPackageServicie;
+import com.logpm.trunkline.vo.TrunklineAdvanceVO;
 import com.logpm.warehouse.feign.IWarehouseTrayTypeClient;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -103,4 +104,23 @@ public class InComingServiceImpl implements IInComingService {
 		}
 		return R.success("入库成功");
 	}
+
+	@Override
+	public R findIncomingOrderList(InComingDTO inComingDTO) {
+		List<TrunklineAdvanceVO> ls = advanceService.findIncomingOrderList(inComingDTO);
+		return R.data(ls);
+	}
+
+	@Override
+	public R incomingBatchOrder(InComingDTO inComingDTO) {
+		List<Long> advanceIds = inComingDTO.getAdvanceIds();
+
+		for (Long advanceId : advanceIds) {
+			List<String> list = advanceDetailService.findNoIncomingPackageCode(advanceId);
+			inComingDTO.setOrderPackageCode(String.join(",",list));
+			incomingPackage(inComingDTO);
+		}
+
+		return R.success("入库成功");
+	}
 }

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

@@ -240,4 +240,9 @@ public class TrunklineAdvanceDetailServiceImpl extends BaseServiceImpl<Trunkline
 	public List<String> findIncomingWarehouseName(Long advanceId) {
 		return baseMapper.findIncomingWarehouseName(advanceId);
 	}
+
+	@Override
+	public List<String> findNoIncomingPackageCode(Long advanceId) {
+		return baseMapper.findNoIncomingPackageCode(advanceId);
+	}
 }

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

@@ -16,6 +16,7 @@ import com.logpm.distribution.entity.DistributionStockArticleEntity;
 import com.logpm.distribution.feign.IDistributionParcelListClient;
 import com.logpm.distribution.feign.IDistributionStockArticleClient;
 import com.logpm.trunkline.dto.AdvanceDTO;
+import com.logpm.trunkline.dto.InComingDTO;
 import com.logpm.trunkline.entity.TrunklineAdvanceDetailEntity;
 import com.logpm.trunkline.entity.TrunklineAdvanceEntity;
 import com.logpm.trunkline.mapper.TrunklineAdvanceMapper;
@@ -315,20 +316,20 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl<TrunklineAdvanc
 		advanceDTO.setEndCreateTime(CommonUtil.getEndByDateStr(advanceDTO.getEndCreateTimeStr()));
 		IPage<TrunklineAdvanceVO> trunklineAdvanceVOIPage = baseMapper.advancePageList(page, advanceDTO);
 
-		List<TrunklineAdvanceVO> records = trunklineAdvanceVOIPage.getRecords();
-		for (TrunklineAdvanceVO trunklineAdvanceVO:records){
-
-
-
-			String dealerName = trunklineAdvanceVO.getDealerName();
-			String brand = trunklineAdvanceVO.getBrand();
-			Long clientId = tripartiteMallClient.getClientIdByNameAndBrand(dealerName, brand);
-			BasicdataClientEntity basicdataClientEntity = basicdataClientClient.findEntityById(clientId);
-			if(!Objects.isNull(basicdataClientEntity)){
-				trunklineAdvanceVO.setHtMallName(basicdataClientEntity.getClientName());
-			}
-		}
-		trunklineAdvanceVOIPage.setRecords(records);
+//		List<TrunklineAdvanceVO> records = trunklineAdvanceVOIPage.getRecords();
+//		for (TrunklineAdvanceVO trunklineAdvanceVO:records){
+//
+//
+//
+//			String dealerName = trunklineAdvanceVO.getDealerName();
+//			String brand = trunklineAdvanceVO.getBrand();
+//			Long clientId = tripartiteMallClient.getClientIdByNameAndBrand(dealerName, brand);
+//			BasicdataClientEntity basicdataClientEntity = basicdataClientClient.findEntityById(clientId);
+//			if(!Objects.isNull(basicdataClientEntity)){
+//				trunklineAdvanceVO.setHtMallName(basicdataClientEntity.getClientName());
+//			}
+//		}
+//		trunklineAdvanceVOIPage.setRecords(records);
 		return trunklineAdvanceVOIPage;
 	}
 
@@ -379,4 +380,9 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl<TrunklineAdvanc
 		baseMapper.updateIncomingWarehouseName(incomingWarehouseName,advanceId);
 	}
 
+	@Override
+	public List<TrunklineAdvanceVO> findIncomingOrderList(InComingDTO inComingDTO) {
+		return baseMapper.findIncomingOrderList(inComingDTO);
+	}
+
 }

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/TaskQuestController.java

@@ -373,6 +373,4 @@ public class TaskQuestController extends BladeController {
 			return R.fail(500,"############syncTaskData: 系统异常");
 		}
 	}
-
-
 }