Merge branch 'pre-production'

blade-biz-common/src/main/java/org/springblade/common/constant/LauncherConstant.java

@@ -56,7 +56,7 @@ public interface LauncherConstant {
 	/**
 	 * nacos test 地址
 	 */
-	String NACOS_TEST_ADDR = "192.168.2.106:8848";
+	String NACOS_TEST_ADDR = "192.168.2.110:8848";
 
 
 	/**
@@ -72,7 +72,7 @@ public interface LauncherConstant {
 	/**
 	 * sentinel test 地址
 	 */
-	String SENTINEL_TEST_ADDR = "192.168.2.106:8858";
+	String SENTINEL_TEST_ADDR = "192.168.2.110:8858";
 
 	/**
 	 * seata dev 地址
@@ -88,7 +88,7 @@ public interface LauncherConstant {
 	/**
 	 * seata test 地址
 	 */
-	String SEATA_TEST_ADDR = "192.168.2.106:8091";
+	String SEATA_TEST_ADDR = "192.168.2.110:8091";
 
 
 	/**

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

@@ -0,0 +1,65 @@
+package com.logpm.basicdata.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.tenant.mp.TenantEntity;
+
+@Data
+@TableName("logpm_basicdata_forwarding_unit")
+@ApiModel(value = "BasicdataForwardingUnit对象", description = "默认仓库发货单位表")
+@EqualsAndHashCode(callSuper = true)
+public class BasicdataForwardingUnitEntity extends TenantEntity {
+
+	/**
+	 * 预留1
+	 */
+	@ApiModelProperty(value = "预留1")
+	private String reserve1;
+	/**
+	 * 预留2
+	 */
+	@ApiModelProperty(value = "预留2")
+	private String reserve2;
+	/**
+	 * 预留3
+	 */
+	@ApiModelProperty(value = "预留3")
+	private String reserve3;
+	/**
+	 * 预留4
+	 */
+	@ApiModelProperty(value = "预留4")
+	private String reserve4;
+	/**
+	 * 预留5
+	 */
+	@ApiModelProperty(value = "预留5")
+	private String reserve5;
+
+
+
+	/**
+	 * 仓库id
+	 */
+	@ApiModelProperty(value = "仓库id")
+	private Long warehouseId;
+
+	@ApiModelProperty(value = "仓库名称")
+	private String warehouseName;
+
+	@ApiModelProperty(value = "用户id")
+	private Long userId;
+
+	/**
+	 * 客户id
+	 */
+	@ApiModelProperty(value = "客户id")
+	private Long clientId;
+
+	@ApiModelProperty(value = "客户名称")
+	private String clientName;
+
+}

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

@@ -0,0 +1,20 @@
+package com.logpm.basicdata.feign;
+
+import org.springblade.common.constant.ModuleNameConstant;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+@FeignClient(
+	value = ModuleNameConstant.APPLICATION_BASICDATA_NAME
+)
+public interface IBasicdataForwardingUnitClient {
+
+	String API_PREFIX = "forwardingUnit/client";
+	String TOP = API_PREFIX + "/top";
+
+
+	@GetMapping(API_PREFIX+"/findForwardingUnitByWarehouseId")
+	Long findForwardingUnitByWarehouseId(@RequestParam("warehouseId") Long warehouseId);
+
+}

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

@@ -0,0 +1,42 @@
+package com.logpm.trunkline.dto;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class ImportOrderNoPackageExcelDTO implements Serializable {
+
+	@ExcelProperty(value = "下单日期")
+	private String orderTime;
+	@ExcelProperty(value = "商场名称")
+	private String dealerName;
+	@ExcelProperty(value = "订单自编号")
+	private String orderCode;
+	@ExcelProperty(value = "销售数量")
+	private String num;
+	@ExcelProperty(value = "商场收货人")
+	private String consigneePerson;
+	@ExcelProperty(value = "商场收货人电话")
+	private String consigneeMobile;
+	@ExcelProperty(value = "商场收货地址")
+	private String consigneeAddress;
+	@ExcelProperty(value = "收货人")
+	private String customerName ;
+	@ExcelProperty(value = "联系电话")
+	private String customerPhone ;
+	@ExcelProperty(value = "地址")
+	private String customerAddress ;
+	@ExcelProperty(value = "车次")
+	private String trainNumber ;
+	@ExcelProperty(value = "发货日期")
+	private String sendDateStr ;
+	@ExcelProperty(value = "品牌")
+	private String brand ;
+	@ExcelProperty(value = "配送区域")
+	private String area ;
+	@ExcelProperty(value = "服务号")
+	private String serviceNum ;
+
+}

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

@@ -23,8 +23,15 @@ public class OpenOrderVO implements Serializable {
 	private Long destinationWarehouseId;//目的仓Id
 
 	private String destination;//到站
+	private String destinationCode;//到站编码
 	private List<String> destinationArray;//到站
 
+	private Long shipperClientId;//发货单位clientId
+	private String shipper;//发货单位
+	private String shipperName;//发货人
+	private String shipperMobile;//发货人电话
+	private String shipperAddress;//发货单位地址
+
 	private Long consigneeClientId;//收货单位clientId
 	private String consignee;//收货单位
 	private String consigneeName;//收货人

blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/PackageListVO.java

@@ -13,5 +13,10 @@ public class PackageListVO implements Serializable {
 	private String orderCode;
 	private String warehouseName;
 	private Integer num;
+	private String firsts;
+	private String seconds;
+	private String thirds;
+	private String materialName;
+	private String materialCode;
 
 }

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml

@@ -144,7 +144,7 @@
             <if test="param.handleStatus != null and param.handleStatus == 50 "> and  lawo.work_order_status in ('20') and lap.types_of = '2'  </if>
             <if test="param.handleStatus!= null and param.handleStatus == 30"> and  lawo.work_order_status in (21,30) and lap.processing_status = '4'  </if>
             <if test="param.handleStatus!= null and param.handleStatus == 10 ">and  lap.types_of = '2' </if>
-            <if test="param.handleStatus!= null and param.handleStatus == 20 ">and ((lawo.work_order_status in (80,100,70) OR lacr.warehouse_id=#{param.warehouseId}) AND lawo.warehouse_id =#{param.warehouseId} ) </if>
+            <if test="param.handleStatus!= null and param.handleStatus == 20 ">and ((lawo.work_order_status in (80,100,70) OR lacr.warehouse_id=#{param.warehouseId})) </if>
             <if test="param.workOrderType != null and param.workOrderType != '' ">and  lawo.work_order_type = #{param.workOrderType } </if>
             <if test="param.discoveryNode != null and param.discoveryNode != '' ">and  lawo.discovery_node = #{param.discoveryNode } </if>
             <if test="param.workOrderNumber != null and param.workOrderNumber != '' ">and  lawo.work_order_number like concat('%',#{param.workOrderNumber },'%')  </if>

blade-service/logpm-basic/src/main/java/com/logpm/basic/controller/BasicMaterialController.java

@@ -151,7 +151,7 @@ public class BasicMaterialController extends BladeController {
 		if(ObjectUtil.isNull(basicMaterial.getName()) || ObjectUtil.isNull(basicMaterial.getProductCode()) ||
 			ObjectUtil.isNull(basicMaterial.getPackageNum()) || ObjectUtil.isNull(basicMaterial.getPackageNum())||
 			ObjectUtil.isNull(basicMaterial.getSku())|| ObjectUtil.isNull(basicMaterial.getPackingSpecification())||
-			ObjectUtil.isNull(basicMaterial.getSpecification()) ||  ObjectUtil.isNull(basicMaterial.getLogpmUnit()) ){
+			ObjectUtil.isNull(basicMaterial.getLogpmUnit()) ){
 			log.info("物料添加失败！");
 			return R.fail("添加失败，必填物料信息不完整为空！");
 		}

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

@@ -0,0 +1,30 @@
+package com.logpm.basicdata.feign;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.logpm.basicdata.entity.BasicdataForwardingUnitEntity;
+import com.logpm.basicdata.service.IBasicdataForwardingUnitService;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
+
+import java.util.Objects;
+
+@ApiIgnore()
+@RestController
+@AllArgsConstructor
+public class BasicdataForwardingUnitClient implements IBasicdataForwardingUnitClient{
+
+	private final IBasicdataForwardingUnitService basicdataForwardingUnitService;
+
+	@Override
+	public Long findForwardingUnitByWarehouseId(Long warehouseId) {
+		QueryWrapper<BasicdataForwardingUnitEntity> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("warehouse_id",warehouseId);
+
+		BasicdataForwardingUnitEntity forwardingUnitEntity = basicdataForwardingUnitService.getOne(queryWrapper);
+		if(!Objects.isNull(forwardingUnitEntity)){
+			return forwardingUnitEntity.getClientId();
+		}
+		return null;
+	}
+}

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

@@ -0,0 +1,11 @@
+package com.logpm.basicdata.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.logpm.basicdata.entity.BasicdataForwardingUnitEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface BasicdataForwardingUnitMapper extends BaseMapper<BasicdataForwardingUnitEntity> {
+
+
+}

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

@@ -0,0 +1,7 @@
+package com.logpm.basicdata.service;
+
+import com.logpm.basicdata.entity.BasicdataForwardingUnitEntity;
+import org.springblade.core.mp.base.BaseService;
+
+public interface IBasicdataForwardingUnitService extends BaseService<BasicdataForwardingUnitEntity> {
+}

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

@@ -0,0 +1,16 @@
+package com.logpm.basicdata.service.impl;
+
+import com.logpm.basicdata.entity.BasicdataForwardingUnitEntity;
+import com.logpm.basicdata.mapper.BasicdataForwardingUnitMapper;
+import com.logpm.basicdata.service.IBasicdataForwardingUnitService;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Slf4j
+@Service
+@AllArgsConstructor
+public class BasicdataForwardingUnitServiceImpl extends BaseServiceImpl<BasicdataForwardingUnitMapper, BasicdataForwardingUnitEntity> implements IBasicdataForwardingUnitService {
+
+}

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java

@@ -487,7 +487,7 @@ public class DistributionDeliveryListController extends BladeController {
 
 	@PostMapping("/cancelDelivery")
 	@ApiOperationSupport(order = 2)
-	@ApiOperation(value = "PC签收包件")
+	@ApiOperation(value = "PC取消包件")
 	public R cancelDelivery(@Valid @RequestBody DistrilbutionAppsignforDTO distrilbutionloadingscanDTO) {
 		R r = distributionDeliveryListService.cancelDelivery(distrilbutionloadingscanDTO.getDeliveryId());
 		if (r.isSuccess()){

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

@@ -819,7 +819,7 @@
         ldpl.order_package_delivery_status
         FROM
             logpm_distribution_reservation_package AS ldrp
-            LEFT JOIN logpm_distribution_parcel_list AS ldpl ON ldpl.order_package_code = ldrp.packet_bar_code and ldpl.warehouse_id=#{warehourseId}
+            LEFT JOIN logpm_distribution_parcel_list AS ldpl ON ldpl.order_package_code = ldrp.packet_bar_code
             LEFT JOIN logpm_warehouse_tray_goods AS lwtg ON ldpl.id = lwtg.association_id and lwtg.association_type = 3
             LEFT JOIN logpm_warehouse_updown_goods AS lwug ON ldpl.id = lwug.association_id and lwug.association_type = 3
         <where>
@@ -830,6 +830,9 @@
             <if test="stockArticleId !=null and stockArticleId!= ''">
                 and ldrp.stock_article_id = #{stockArticleId}
             </if>
+            <if test="warehourseId !=null and warehourseId!= ''">
+                and ldpl.warehouse_id=#{warehourseId}
+            </if>
         </where>
     </select>
     <select id="selectStockArticleByReservationId"

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

@@ -6868,14 +6868,15 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		);
 		log.info(">>>>>>>>>>>>>>> 车次状态维护3 代码执行 list={}",list);
 
-		if (!list.isEmpty()) {
+		if (list.size()>0) {
 			//查看所有的签收信息是否均已完成
 			boolean anyMatch = list.stream().allMatch(s -> s.getSigningStatus().equals(SignforStatusConstant.yiqianshou.getValue()));
 			log.info(">>>>>>>>>>>>>>> 车次状态维护4 代码执行 anyMatch={}",anyMatch);
-
 			if (anyMatch) {
 				deliveryListEntity.setDeliveryStatus(DeliveryStatusConstant.yiwancheng.getValue());
 			}
+		}else {
+			log.error(method + "查询配送单签收信息错误，deliveryId:{}", deliveryId);
 		}
 
 		this.updateById(deliveryListEntity);

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

@@ -4038,7 +4038,12 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		if (Func.isNotEmpty(reservationStockarticleEntityList)) {
 			reservationStockarticleEntityList.forEach(rs -> {
 				if (rs.getIsZero().equals(IsOrNoConstant.no.getValue())) {
-					List<DistributionParcelListEntity> parcelListEntityList = distributionReservationMapper.selectPackageByReservationAndStockArticle(rs.getReservationId(), rs.getStockArticleId(), myCurrentWarehouse.getId());
+					List<DistributionParcelListEntity> parcelListEntityList = null;
+					if (Func.isNotEmpty(myCurrentWarehouse)){
+						 parcelListEntityList = distributionReservationMapper.selectPackageByReservationAndStockArticle(rs.getReservationId(), rs.getStockArticleId(), myCurrentWarehouse.getId());
+					}else {
+						parcelListEntityList = distributionReservationMapper.selectPackageByReservationAndStockArticle(rs.getReservationId(), rs.getStockArticleId(), null);
+					}
 					List<DistributionParcelListVO> parcelListVOList = DistributionParcelListWrapper.build().listVO(parcelListEntityList);
 					parcelListVOList.forEach(p -> {
 						p.setReservationNum(p.getQuantity());

blade-service/logpm-distribution/src/main/resources/application-test.yml

@@ -12,10 +12,10 @@ server:
 spring:
   #rabbitmq配置
   rabbitmq:
-    host: 192.168.2.106
+    host: 192.168.2.110
     port: 5672
     username: admin
-    password: admin@1234.
+    password: Slwk@123654
     #虚拟host 可以不设置,使用server默认host
     virtual-host: /
     #确认消息已发送到队列(Queue)

blade-service/logpm-factory/src/main/resources/application-test.yml

@@ -31,10 +31,10 @@ spring:
           password: ${blade.datasource.factory.slave.password}
   #rabbitmq配置
   rabbitmq:
-    host: 192.168.2.106
+    host: 192.168.2.110
     port: 5672
     username: admin
-    password: admin@1234.
+    password: Slwk@123654
     #虚拟host 可以不设置,使用server默认host
     virtual-host: /
     #确认消息已发送到队列(Queue)

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

@@ -337,6 +337,39 @@ public class OpenOrderController {
 		}
 	}
 
+	@ResponseBody
+	@PostMapping("/advanceNoPackageToWaybillInfo")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "暂存单转运单", notes = "传入waybillDTO")
+	public R advanceNoPackageToWaybillInfo(@RequestBody AdvanceDTO advanceDTO) {
+		String method = "############advanceNoPackageToWaybillInfo: ";
+		log.info(method + "请求参数{}", advanceDTO);
+		List<Long> advanceIds = advanceDTO.getAdvanceIds();
+		try{
+
+			//当前登录人选择的仓库
+			BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
+			if(Objects.isNull(myCurrentWarehouse)){
+				log.warn(method+"仓库信息为空 myCurrentWarehouse={}",myCurrentWarehouse);
+				return R.fail(403,"仓库信息为空");
+			}
+
+			if(advanceIds.isEmpty()){
+				log.warn(method+"未选择暂存单 advanceIds={}",advanceIds);
+				return R.fail(403,"未选择暂存单");
+			}
+
+			return openOrderService.advanceNoPackageToWaybillInfo(advanceIds,myCurrentWarehouse.getId());
+		}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("/openWaybill")
 	@ApiOperationSupport(order = 1)
@@ -1163,6 +1196,10 @@ public class OpenOrderController {
 			openOrderDTO.setWarehouseId(myCurrentWarehouse.getId());
 			openOrderDTO.setWarehouseName(myCurrentWarehouse.getName());
 
+			if(Objects.isNull(waybillId)){
+				log.warn(method+"运单id为空 waybillId={}",waybillId);
+				return R.fail(403,"运单id为空");
+			}
 			return openOrderService.checkWaybill(openOrderDTO);
 		}catch (CustomerException e){
 			log.error(e.message,e);

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

@@ -13,7 +13,7 @@
         select ltad.id id,
                ltad.warehouse_id warehouseId,
                ltad.warehouse_name warehouseName,
-               ltad.waybill_no waybillNo,
+               lta.waybill_no waybillNo,
                ltad.order_code orderCode,
                lta.train_number trainNumber,
                ltad.package_status packageStatus,

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

@@ -354,6 +354,7 @@
         <if test="param.type != null and param.type == 2">
             and ltcl.load_status != '0'
         </if>
+        order by ltcl.create_time desc
     </select>
 
     <select id="carsLoadPageList" resultType="com.logpm.trunkline.vo.TrunklineCarsLoadVO">

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

@@ -222,6 +222,7 @@
         where ltcls.load_id = #{loadId}
         and ltcls.warehouse_id = #{warehouseId}
         and ltcls.final_node_id is null
+        and ltcls.scan_status = '1'
     </select>
 
     <update id="updateFinalNodeIdById">

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

@@ -65,6 +65,7 @@ public interface IOpenOrderService {
 
 	R checkWaybill(OpenOrderDTO openOrderDTO);
 
+	R advanceNoPackageToWaybillInfo(List<Long> advanceIds, Long warehouseId);
 
 
 //	R findWaybillInfo(String waybillNo);

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

@@ -74,6 +74,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 	private final ITrunklineWaybillPackageService trunklineWaybillPackageService;
 	private final IBasicMaterialClient basicMaterialClient;
 	private final IBasicdataBrandClient basicdataBrandClient;
+	private final IBasicdataForwardingUnitClient basicdataForwardingUnitClient;
 
 	@Override
 	public IPage<TrunklineAdvanceVO> advancePageList(AdvanceDTO advanceDTO) {
@@ -130,8 +131,18 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 		openOrderVO.setDepartureWarehouseName(basicdataWarehouseEntity.getName());
 		openOrderVO.setDepartureWarehouseId(warehouseId);
 		openOrderVO.setTotalNum(totalNum);
-
-		//发货单位 TODO
+		//发货单位
+		Long shipperId = basicdataForwardingUnitClient.findForwardingUnitByWarehouseId(warehouseId);
+		if(!Objects.isNull(shipperId)){
+			BasicdataClientEntity basicdataClientEntity = basicdataClientClient.findEntityById(shipperId);
+			if(!Objects.isNull(basicdataClientEntity)){
+				openOrderVO.setShipperClientId(shipperId);
+				openOrderVO.setShipper(basicdataClientEntity.getClientName());
+				openOrderVO.setShipperName(basicdataClientEntity.getLinkman());
+				openOrderVO.setShipperMobile(basicdataClientEntity.getPhone());
+				openOrderVO.setShipperAddress(basicdataClientEntity.getDetailedly());
+			}
+		}
 
 
 		//收货单位-----根据三方商场找到对应的clientId
@@ -151,20 +162,22 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 			destinationArray.add(bladeRegionProvinceId);
 			destinationArray.add(bladeRegionCityId);
 			String name = regionFeign.getName(bladeRegionCityId);
+			String areaId = bladeRegionCityId;
 			if(!StringUtil.isBlank(badeRegionAreaId)){
 				destinationArray.add(badeRegionAreaId);
 				name = regionFeign.getName(badeRegionAreaId);
+				areaId = badeRegionAreaId;
 			}
 
 			openOrderVO.setDestination(name);
+			openOrderVO.setDestinationCode(areaId);
 			openOrderVO.setDestinationArray(destinationArray);
 
 			openOrderVO.setDefaultPayWay(basicdataClientEntity.getDefaultPaymentMethods());
 
 			//查询目的仓数据
-			List<BasicdataStorageServicesEntity> storageServicesEntities = basicdataStorageServicesClient.findBySendWarehouseIdAndClientId(warehouseId,clientId);
-			if(!storageServicesEntities.isEmpty()){
-				BasicdataStorageServicesEntity basicdataStorageServicesEntity = storageServicesEntities.get(0);
+			BasicdataStorageServicesEntity basicdataStorageServicesEntity = basicdataStorageServicesClient.findEntityBySendWarehouseIdAndClientId(warehouseId, clientId);
+			if(!Objects.isNull(basicdataStorageServicesEntity)){
 				openOrderVO.setDestinationWarehouseId(basicdataStorageServicesEntity.getServeWarehouseId());
 				openOrderVO.setDestinationWarehouseName(basicdataStorageServicesEntity.getServeWarehouseName());
 			}
@@ -761,6 +774,18 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 		openOrderVO.setDepartureWarehouseName(basicdataWarehouseEntity.getName());
 		openOrderVO.setDepartureWarehouseId(warehouseId);
 
+		Long shipperId = basicdataForwardingUnitClient.findForwardingUnitByWarehouseId(warehouseId);
+		if(!Objects.isNull(shipperId)){
+			BasicdataClientEntity basicdataClientEntity = basicdataClientClient.findEntityById(shipperId);
+			if(!Objects.isNull(basicdataClientEntity)){
+				openOrderVO.setShipperClientId(shipperId);
+				openOrderVO.setShipper(basicdataClientEntity.getClientName());
+				openOrderVO.setShipperName(basicdataClientEntity.getLinkman());
+				openOrderVO.setShipperMobile(basicdataClientEntity.getPhone());
+				openOrderVO.setShipperAddress(basicdataClientEntity.getDetailedly());
+			}
+		}
+
 		//查询支付方式
 		openOrderVO.setPayTypeList(DictBizCache.getList(DictBizConstant.OPEN_ORDER_PAY_TYPE));
 		//查询付款方式
@@ -1512,81 +1537,38 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 		}
 		InputStream inputStream = file.getInputStream();
 
-		List<OrderNoPackageExcelDTO> orderNoPackageExcelDTOS  = EasyExcel.read(inputStream).head(OrderNoPackageExcelDTO.class).sheet(0).headRowNumber(2).doReadSync();
-		Map<String, List<OrderNoPackageExcelDTO>> listMap = orderNoPackageExcelDTOS.parallelStream().collect(Collectors.groupingBy(a -> a.getOrderCode() + "&" + a.getTrainNumber()));
-
-		listMap.remove("null&null");
-
-		Set<String> set = listMap.keySet();
-
-		for (String str : set) {
-			String[] split = str.split("&");
-			String orderCode = split[0];
-			String trainNumber = split[1];
-			List<OrderNoPackageExcelDTO> noPackageExcelDTOList = listMap.get(str);
-			OrderNoPackageExcelDTO orderNoPackageExcelDTO = noPackageExcelDTOList.get(0);
+		List<ImportOrderNoPackageExcelDTO> importOrderNoPackageExcelDTOS  = EasyExcel.read(inputStream).head(ImportOrderNoPackageExcelDTO.class).sheet(0).headRowNumber(2).doReadSync();
+		List<TrunklineAdvanceEntity> list = new ArrayList<>();
+		for (ImportOrderNoPackageExcelDTO importOrderNoPackageExcelDTO : importOrderNoPackageExcelDTOS) {
+			String orderCode = importOrderNoPackageExcelDTO.getOrderCode();
+			String trainNumber = importOrderNoPackageExcelDTO.getTrainNumber();
 			TrunklineAdvanceEntity trunklineAdvanceEntity = advanceService.findEntityByOrderCodeAndTrainNumber(orderCode, trainNumber);
 			if(Objects.isNull(trunklineAdvanceEntity)){
 				trunklineAdvanceEntity = new TrunklineAdvanceVO();
 				trunklineAdvanceEntity.setWarehouseId(warehouseId);
 				trunklineAdvanceEntity.setWarehouseName(warehouseName);
 				trunklineAdvanceEntity.setOrderCode(orderCode);
-				trunklineAdvanceEntity.setBrand(orderNoPackageExcelDTO.getBrand());
-				trunklineAdvanceEntity.setTotalNum(Integer.parseInt(orderNoPackageExcelDTO.getNum()));
-				trunklineAdvanceEntity.setPackName(orderNoPackageExcelDTO.getFirsts());
-				trunklineAdvanceEntity.setDealerName(orderNoPackageExcelDTO.getDealerName());
-				trunklineAdvanceEntity.setCustomerName(orderNoPackageExcelDTO.getCustomerName());
-				trunklineAdvanceEntity.setCustomerPhone(orderNoPackageExcelDTO.getCustomerPhone());
-				trunklineAdvanceEntity.setCustomerAddress(orderNoPackageExcelDTO.getCustomerAddress());
-				trunklineAdvanceEntity.setConsigneePerson(orderNoPackageExcelDTO.getConsigneePerson());
-				trunklineAdvanceEntity.setConsigneeMobile(orderNoPackageExcelDTO.getConsigneeMobile());
-				trunklineAdvanceEntity.setConsigneeAddress(orderNoPackageExcelDTO.getConsigneeAddress());
+				trunklineAdvanceEntity.setBrand(importOrderNoPackageExcelDTO.getBrand());
+				trunklineAdvanceEntity.setTotalNum(Integer.parseInt(importOrderNoPackageExcelDTO.getNum()));
+				trunklineAdvanceEntity.setDealerName(importOrderNoPackageExcelDTO.getDealerName());
+				trunklineAdvanceEntity.setCustomerName(importOrderNoPackageExcelDTO.getCustomerName());
+				trunklineAdvanceEntity.setCustomerPhone(importOrderNoPackageExcelDTO.getCustomerPhone());
+				trunklineAdvanceEntity.setCustomerAddress(importOrderNoPackageExcelDTO.getCustomerAddress());
+				trunklineAdvanceEntity.setConsigneePerson(importOrderNoPackageExcelDTO.getConsigneePerson());
+				trunklineAdvanceEntity.setConsigneeMobile(importOrderNoPackageExcelDTO.getConsigneeMobile());
+				trunklineAdvanceEntity.setConsigneeAddress(importOrderNoPackageExcelDTO.getConsigneeAddress());
 				trunklineAdvanceEntity.setSystemType("线上");
 				trunklineAdvanceEntity.setMatingType("1");
 				trunklineAdvanceEntity.setWaybillStatus("0");
-				trunklineAdvanceEntity.setTrainNumber(orderNoPackageExcelDTO.getTrainNumber());
+				trunklineAdvanceEntity.setTrainNumber(importOrderNoPackageExcelDTO.getTrainNumber());
 				trunklineAdvanceEntity.setFreezeStatus("0");
 				trunklineAdvanceEntity.setLegacyStatus("0");
 				trunklineAdvanceEntity.setHasPackage(0);
 				trunklineAdvanceEntity.setCreateUserName(AuthUtil.getUserName());
-				advanceService.save(trunklineAdvanceEntity);
-			}
-
-			List<TrunklineAdvanceDetailEntity> advanceDetailEntities = new ArrayList<>();
-			for (OrderNoPackageExcelDTO noPackageExcelDTO : orderNoPackageExcelDTOS) {
-
-				TrunklineAdvanceDetailEntity advanceDetailModel = new TrunklineAdvanceDetailEntity();
-				advanceDetailModel.setWarehouseId(warehouseId);
-				advanceDetailModel.setWarehouseName(warehouseName);
-				advanceDetailModel.setAdvanceId(trunklineAdvanceEntity.getId());
-				advanceDetailModel.setOrderCode(orderCode);
-				advanceDetailModel.setBrand(noPackageExcelDTO.getBrand());
-				advanceDetailModel.setSystemType("线上");
-
-				advanceDetailModel.setFirstPackName(noPackageExcelDTO.getFirsts());
-				String sencods = noPackageExcelDTO.getSencods();
-				if(StringUtil.isBlank(sencods)){
-					advanceDetailModel.setSecondPackName(noPackageExcelDTO.getFirsts());
-				}else{
-					advanceDetailModel.setSecondPackName(sencods);
-				}
-				String thirds = noPackageExcelDTO.getThirds();
-				if(StringUtil.isBlank(thirds)){
-					advanceDetailModel.setThirdPackName(noPackageExcelDTO.getFirsts());
-				}else{
-					advanceDetailModel.setThirdPackName(thirds);
-				}
-				advanceDetailModel.setQuantity(Integer.parseInt(noPackageExcelDTO.getNum()));
-				advanceDetailModel.setServiceNum(noPackageExcelDTO.getServiceNum());
-				advanceDetailModel.setPackageStatus("0");
-				advanceDetailModel.setFirstPackName(noPackageExcelDTO.getFirsts());
-				advanceDetailModel.setSecondPackName(noPackageExcelDTO.getSencods());
-				advanceDetailModel.setThirdPackName(noPackageExcelDTO.getThirds());
-				advanceDetailEntities.add(advanceDetailModel);
+				list.add(trunklineAdvanceEntity);
 			}
-			advanceDetailService.saveBatch(advanceDetailEntities);
-
 		}
+		advanceService.saveBatch(list);
 
 		return R.success("导入成功");
 	}
@@ -1625,9 +1607,132 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 		}catch (Exception e){
 			log.warn("###############checkWaybill: 存入日志失败");
 		}
+		return R.success("审核成功");
+	}
 
+	@Override
+	public R advanceNoPackageToWaybillInfo(List<Long> advanceIds, Long warehouseId) {
+		log.info("##################advanceNoPackageToWaybillInfo: 暂存单转运单");
 
-		return R.success("审核成功");
+		BasicdataWarehouseEntity basicdataWarehouseEntity = basicdataWarehouseClient.getEntityWarehouseId(warehouseId);
+		if(Objects.isNull(basicdataWarehouseEntity)){
+			log.warn("##############advanceNoPackageToWaybillInfo: 仓库信息不存在 warehouseId={}",warehouseId);
+			return R.fail(405,"仓库信息不存在");
+		}
+
+		//先查询出所有的暂存单
+		List<TrunklineAdvanceEntity> list = advanceService.findListByIds(advanceIds);
+
+		if(list.isEmpty()){
+			log.warn("##############advanceNoPackageToWaybillInfo: 暂存单数据不存在 advanceIds={}",advanceIds);
+			return R.fail(405,"暂存单数据不存在");
+		}
+		String dealerName = null;
+		String brand = null;
+		Integer totalNum = 0;
+		for (TrunklineAdvanceEntity advanceEntity:list){
+			if(StringUtil.isBlank(dealerName)){
+				dealerName = advanceEntity.getDealerName();
+			}
+			if(StringUtil.isBlank(brand)){
+				brand = advanceEntity.getBrand();
+			}
+
+			totalNum = totalNum + advanceEntity.getTotalNum();
+		}
+		OpenOrderVO openOrderVO = new OpenOrderVO();
+		//查询品牌 客户车次号 订单自编码
+		OpenOrderVO infoByIds = advanceService.selectInfoByIds(advanceIds);
+		BeanUtil.copy(infoByIds,openOrderVO);
+		openOrderVO.setAdvanceIds(advanceIds);
+		//发站仓-----目前登录人的仓库
+		openOrderVO.setDepartureWarehouseName(basicdataWarehouseEntity.getName());
+		openOrderVO.setDepartureWarehouseId(warehouseId);
+		openOrderVO.setTotalNum(totalNum);
+		//发货单位
+		Long shipperId = basicdataForwardingUnitClient.findForwardingUnitByWarehouseId(warehouseId);
+		if(!Objects.isNull(shipperId)){
+			BasicdataClientEntity basicdataClientEntity = basicdataClientClient.findEntityById(shipperId);
+			if(!Objects.isNull(basicdataClientEntity)){
+				openOrderVO.setShipperClientId(shipperId);
+				openOrderVO.setShipper(basicdataClientEntity.getClientName());
+				openOrderVO.setShipperName(basicdataClientEntity.getLinkman());
+				openOrderVO.setShipperMobile(basicdataClientEntity.getPhone());
+				openOrderVO.setShipperAddress(basicdataClientEntity.getDetailedly());
+			}
+		}
+
+
+		//收货单位-----根据三方商场找到对应的clientId
+		Long clientId = basicdataTripartiteMallClient.getClientIdByNameAndBrand(dealerName, brand);
+		BasicdataClientEntity basicdataClientEntity = basicdataClientClient.findEntityById(clientId);
+		if(!Objects.isNull(basicdataClientEntity)){
+			openOrderVO.setConsigneeClientId(clientId);
+			openOrderVO.setConsignee(basicdataClientEntity.getClientName());
+			openOrderVO.setConsigneeName(basicdataClientEntity.getLinkman());
+			openOrderVO.setConsigneeMobile(basicdataClientEntity.getPhone());
+			openOrderVO.setConsigneeAddress(basicdataClientEntity.getDetailedly());
+
+			List<String> destinationArray = new ArrayList<>();
+			String badeRegionAreaId = basicdataClientEntity.getBladeRegionAreaId();
+			String bladeRegionProvinceId = basicdataClientEntity.getBladeRegionProvinceId();
+			String bladeRegionCityId = basicdataClientEntity.getBladeRegionCityId();
+			destinationArray.add(bladeRegionProvinceId);
+			destinationArray.add(bladeRegionCityId);
+			String name = regionFeign.getName(bladeRegionCityId);
+			String areaId = bladeRegionCityId;
+			if(!StringUtil.isBlank(badeRegionAreaId)){
+				destinationArray.add(badeRegionAreaId);
+				name = regionFeign.getName(badeRegionAreaId);
+				areaId = badeRegionAreaId;
+			}
+
+			openOrderVO.setDestination(name);
+			openOrderVO.setDestinationCode(areaId);
+			openOrderVO.setDestinationArray(destinationArray);
+
+			openOrderVO.setDefaultPayWay(basicdataClientEntity.getDefaultPaymentMethods());
+
+			//查询目的仓数据
+			BasicdataStorageServicesEntity basicdataStorageServicesEntity = basicdataStorageServicesClient.findEntityBySendWarehouseIdAndClientId(warehouseId, clientId);
+			if(!Objects.isNull(basicdataStorageServicesEntity)){
+				openOrderVO.setDestinationWarehouseId(basicdataStorageServicesEntity.getServeWarehouseId());
+				openOrderVO.setDestinationWarehouseName(basicdataStorageServicesEntity.getServeWarehouseName());
+			}
+		}
+
+		//组装货物数据
+//		List<AdvanceDetailGoodsVO> goodsList = advanceDetailService.findGoodsListByAdvanceIds(advanceIds);
+		//因为这个时候还没有到站信息，所有无法去匹配一个该商场的货物单价
+//		for (AdvanceDetailGoodsVO advanceDetailGoodsVO:goodsList){
+//			String goodsName = advanceDetailGoodsVO.getGoodsName();
+//			if(!Objects.isNull(basicdataClientEntity)){
+//				//TODO 这里要根据商场信息和物品名称去匹配一个预设单价
+//				advanceDetailGoodsVO.setPrice(BigDecimal.ZERO);
+//			}else{
+//				//因为没有
+//			}
+//		}
+//		openOrderVO.setGoodsList(goodsList);
+
+		//查询支付方式
+		openOrderVO.setPayTypeList(DictBizCache.getList(DictBizConstant.OPEN_ORDER_PAY_TYPE));
+		//查询付款方式
+		openOrderVO.setPayWayList(DictBizCache.getList(DictBizConstant.OPEN_ORDER_PAY_WAY));
+		//查询送货方式
+		openOrderVO.setDeliveryWayList(DictBizCache.getList(DictBizConstant.OPEN_ORDER_DELIVERY_WAY));
+		//查询紧急度
+		openOrderVO.setUrgencyList(DictBizCache.getList(DictBizConstant.OPEN_ORDER_URGENCY));
+		//查询回单方式
+		openOrderVO.setReceiptList(DictBizCache.getList(DictBizConstant.OPEN_ORDER_RECEIPT));
+		//查询回单方式
+		openOrderVO.setTransportTypeList(DictBizCache.getList(DictBizConstant.OPEN_ORDER_TRANSPORT_TYPE));
+
+		openOrderVO.setOpenOrderUserName(AuthUtil.getNickName());
+
+		openOrderVO.setOpenOrderDate(CommonUtil.dateToStringGeneral(new Date()));
+
+		return R.data(openOrderVO);
 	}
 
 	private String verifyData(OpenOrderDTO openOrderDTO, WarehouseWaybillEntity waybillEntity) {

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

@@ -90,6 +90,9 @@ public class WarehouseStockController extends BladeController {
 	@ApiOperation(value = "分页", notes = "传入WarehouseStock")
 	public R<IPage<WarehouseScanRecordVO>> page(WarehouseScanRecordVO warehouseScanRecordVO, Query query) {
 		IPage<WarehouseScanRecordVO> pages = warehouseStockService.selectWarehouseStockPage(Condition.getPage(query), warehouseScanRecordVO);
+		if (Func.isEmpty(pages)){
+			return R.data(null);
+		}
 		return R.data(WarehouseStockVOWrapper.build().pageVO(pages));
 	}
 

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

@@ -143,7 +143,7 @@
             <if test="param.thirdProduct != null and param.thirdProduct != '' ">
                 and ldpl.third_product like concat('%',#{param.thirdProduct},'%')
             </if>
-            <if test="param.date != null and param.date != '' ">
+            <if test="param.date != null  ">
                 and ldl.update_time like concat(#{param.date},'%')
             </if>
         </where>
@@ -244,7 +244,7 @@
             <if test="param.thirdProduct != null and param.thirdProduct != '' ">
                 and ldpl.third_product like concat('%',#{param.thirdProduct},'%')
             </if>
-            <if test="param.date != null and param.date != '' ">
+            <if test="param.date != null  ">
                 and ldl.create_time like concat(#{param.date},'%')
             </if>
         </where>
@@ -345,7 +345,7 @@
             <if test="param.thirdProduct != null and param.thirdProduct != '' ">
                 and ldpl.third_product like concat('%',#{param.thirdProduct},'%')
             </if>
-            <if test="param.date != null and param.date != '' ">
+            <if test="param.date != null  ">
                 and ldl.update_time like concat(#{param.date},'%')
             </if>
         </where>
@@ -452,7 +452,7 @@
             <if test="param.thirdProduct != null and param.thirdProduct != '' ">
                 and ldpl.third_product like concat('%',#{param.thirdProduct},'%')
             </if>
-            <if test="param.date != null and param.date != '' ">
+            <if test="param.date != null  ">
                 and lds.create_time like concat(#{param.date},'%')
             </if>
         </where>
@@ -552,7 +552,7 @@
             <if test="param.thirdProduct != null and param.thirdProduct != '' ">
                 and ldpl.third_product like concat('%',#{param.thirdProduct},'%')
             </if>
-            <if test="param.date != null and param.date != '' ">
+            <if test="param.date != null  ">
                 and lwug.create_time like concat(#{param.date},'%')
             </if>
         </where>
@@ -652,7 +652,7 @@
             <if test="param.thirdProduct != null and param.thirdProduct != '' ">
                 and ldpl.third_product like concat('%',#{param.thirdProduct},'%')
             </if>
-            <if test="param.date != null and param.date != '' ">
+            <if test="param.date != null  ">
                 and lwtg.create_time like concat(#{param.date},'%')
             </if>
         </where>

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

@@ -387,7 +387,12 @@
                ldpl.waybill_number waybillNo,
                ldpl.order_code orderCode,
                ldpl.warehouse warehouseName,
-               lwtg.num num
+               lwtg.num num,
+               ldpl.firsts firsts,
+               ldpl.second seconds,
+               ldpl.third_product thirds,
+               ldpl.material_name materialName,
+               ldpl.material_code materialCode
         from logpm_warehouse_tray_goods lwtg
         left join logpm_distribution_parcel_list ldpl on ldpl.order_package_code = lwtg.association_value
         where lwtg.tray_code = #{trayCode}

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

@@ -431,7 +431,12 @@
                ldpl.waybill_number waybillNo,
                ldpl.order_code orderCode,
                ldpl.warehouse warehouseName,
-               lwug.num num
+               lwug.num num,
+               ldpl.firsts firsts,
+               ldpl.second seconds,
+               ldpl.third_product thirds,
+               ldpl.material_name materialName,
+               ldpl.material_code materialCode
         from logpm_warehouse_updown_goods lwug
         left join logpm_distribution_parcel_list ldpl on ldpl.order_package_code = lwug.association_value
         where lwug.allocation_id = #{allocationId}

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

@@ -704,6 +704,14 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl<WarehouseWaybil
 		page.setSize(waybillDTO.getPageSize());
 
 		IPage<WarehouseWaybillVO> pageList =  baseMapper.pageList(page,waybillDTO);
+		List<WarehouseWaybillVO> records = pageList.getRecords();
+		for (WarehouseWaybillVO record : records) {
+			Long waybillId = record.getId();
+			List<WarehouseWayBillDetail> wayBillDetailList = warehouseWayBillDetailService.findByWaybillId(waybillId);
+			record.setDetailList(wayBillDetailList);
+		}
+		pageList.setRecords(records);
+
 		return pageList;
 	}
 

blade-service/logpm-warehouse/src/main/resources/application-test.yml

@@ -31,10 +31,10 @@ spring:
           password: ${blade.datasource.warehouse.slave.password}
   #rabbitmq配置
   rabbitmq:
-    host: 192.168.2.106
+    host: 192.168.2.110
     port: 5672
     username: admin
-    password: admin@1234.
+    password: Slwk@123654
     #虚拟host 可以不设置,使用server默认host
     virtual-host: /
     #确认消息已发送到队列(Queue)

pom.xml

@@ -205,7 +205,7 @@
         <repository>
             <id>logpm</id>
             <name>logpm</name>
-            <url>http://192.168.10.46:8081/repository/maven-public/</url>
+            <url>http://192.168.2.46:8081/repository/maven-public/</url>
         </repository>
         <repository>
             <id>aliyun-repos</id>