添加pda缺少字段

blade-biz-common/src/main/java/org/springblade/common/utils/CommonUtil.java

@@ -32,6 +32,25 @@ import java.util.*;
  */
 @Log4j2
 public class CommonUtil {
+	/**
+	 * 把字符串改为list
+	 * @param num
+	 * @return
+	 */
+	public static List<String> stringNum(String num){
+
+		List<String> list = new ArrayList<>();
+		if(num.contains(",")){
+			list.addAll(Arrays.asList(num.split(",")));
+		}else if(num.contains(" ")){
+			list.addAll( Arrays.asList(num.split(" ")));
+		}else if(num.contains("，")){
+			list.addAll( Arrays.asList(num.split("，")));
+		}else{
+			list.add(num);
+		}
+		return list;
+	}
 
 	public static LocalDate stringToLocalDate(String time){
 		if(!StringUtils.hasLength(time)){

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppDeliveryListVO.java

@@ -112,6 +112,11 @@ public class DistributionAppDeliveryListVO extends DistributionDeliveryListEntit
 	 */
 	@ApiModelProperty(value = "地址")
 	private String deliveryAddress;
+	/**
+	 * 备货地址
+	 */
+	@ApiModelProperty(value = "备货地址")
+	private String stockupArea;
 
 
 

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppReservationVO.java

@@ -67,6 +67,12 @@ public class DistributionAppReservationVO extends DistributionReservationEntity
 	@ApiModelProperty(value = "订单总数")
 	private Integer ordNub;
 
+	/**
+	 * 备货地址
+	 */
+	@ApiModelProperty(value = "备货地址")
+	private String stockupArea;
+
 
 
 

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppSignforVO.java

@@ -47,6 +47,11 @@ public class DistributionAppSignforVO extends DistributionSignforEntity {
 	 */
 	@ApiModelProperty(value = "订单总数")
 	private Integer ordNub;
+	/**
+	 * 是否加急 1-否、2-是
+	 */
+	@ApiModelProperty(value = "是否加急 1-否、2-是")
+	private String isUrgent;
 
 	/**
 	 * 扫描件数
@@ -59,5 +64,10 @@ public class DistributionAppSignforVO extends DistributionSignforEntity {
 	 */
 	@ApiModelProperty(value = "配送状态")
 	private String deliveryStatus;
+	/**
+	 * 预约备注信息
+	 */
+	@ApiModelProperty(value = "预约备注信息")
+	private String  remarks;
 
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionSignforAppController.java

@@ -1,6 +1,8 @@
 package com.logpm.distribution.appcontroller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.logpm.distribution.dto.DistributionSignforDTO;
 import com.logpm.distribution.dto.DistrilbutionAppsignforDTO;
@@ -17,9 +19,12 @@ import lombok.AllArgsConstructor;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.ObjectUtil;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * 签收 控制器
@@ -177,5 +182,25 @@ public class DistributionSignforAppController {
 		R msg	= distributionSignforService.offline(distributionSignfor.getOfflineJson());
 		return msg;
 	}
+	/**
+	 * 签收管理 回显照片信息
+	 */
+	@PostMapping("/prices")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "回显照片", notes = "回显照片")
+	public R prices(@Valid @RequestBody DistributionSignforDTO distributionSignfor) {
+		if(ObjectUtil.isNotEmpty(distributionSignfor.getReservationId())){
+			DistributionSignforEntity one = distributionSignforService.getOne(Wrappers.<DistributionSignforEntity>query().lambda()
+				.eq(DistributionSignforEntity::getReservationId, distributionSignfor.getReservationId())
+			);
+			Map<String,Object> map = new HashMap<>();
+			map.put("deliverySignPictures",one.getDeliverySignPictures());
+			map.put("driverRemarks",one.getDriverRemarks());
+			return R.data(map);
+		}else {
+			return R.fail(3002,"参数不能为空不对！！");
+		}
+
+	}
 
 }

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

@@ -29,6 +29,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
+import org.springblade.common.utils.CommonUtil;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.excel.util.ExcelUtil;
 import org.springblade.core.mp.support.Condition;
@@ -84,8 +85,10 @@ public class DistributionStockArticleController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入distributionStockArticle")
 	public R<IPage<DistributionStockArticleVO>> list(@ApiIgnore @RequestParam Map<String, Object> distributionStockArticle, Query query) {
-		Object o = distributionStockArticle.get("orderSelfNumbering");
-		distributionStockArticle.remove("orderSelfNumbering");
+		Object orderCodeNum = distributionStockArticle.get("orderCodeNum");
+		distributionStockArticle.remove("orderCodeNum");
+		Object waybillNum = distributionStockArticle.get("waybillNum");
+		distributionStockArticle.remove("waybillNum");
 		Object o2 = distributionStockArticle.get("startDate");
 		Object o1 = distributionStockArticle.get("entDate");
 		Object d = distributionStockArticle.get("id");
@@ -97,13 +100,29 @@ public class DistributionStockArticleController extends BladeController {
 		QueryWrapper<DistributionStockArticleEntity> queryWrapper = Condition.getQueryWrapper(distributionStockArticle, DistributionStockArticleEntity.class);
 		if(Func.isNotEmpty(reservation)){
 			queryWrapper.in("reservation_status","10");
+		}
+		if(Func.isNotEmpty(orderCodeNum)){
+			String anumbering = orderCodeNum.toString();
+			List<String> list = CommonUtil.stringNum(anumbering);
+			if(list.size() > 1){
+				queryWrapper.in("order_code",list);
+			}else{
+				queryWrapper.like("order_code",anumbering);
+			}
 
 		}
-		if(Func.isNotEmpty(o)){
-			queryWrapper.in("order_self_numbering",String.valueOf(o).split(","));
+		if(Func.isNotEmpty(waybillNum)){
+			String waybill = waybillNum.toString();
+			List<String> list = CommonUtil.stringNum(waybill);
+			if(list.size() > 1){
+				queryWrapper.in("waybill_number",list);
+			}else{
+				queryWrapper.like("waybill_number",waybill);
+			}
 		}
 		if(ObjectUtil.isNotEmpty(d)){
-			queryWrapper.in("id",String.valueOf(d).split(","));
+			String  ids = d.toString();
+			queryWrapper.in("id",CommonUtil.stringNum(ids));
 		}
 		if(ObjectUtil.isNotEmpty(o2)){
 			queryWrapper.between("warehouse_entry_time",o2,o1);

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/app/DistributionAppDeliveryListDTO.java

@@ -39,6 +39,12 @@ public class DistributionAppDeliveryListDTO extends DistributionDeliveryListEnti
 	@ApiModelProperty(value = "查询创建时间")
 	private String createTime_query;
 
+	/**
+	 * 服务类型
+	 */
+	@ApiModelProperty(value = "服务类型")
+	private String type;
+
 	/**
 	 * 是否扫描
 	 */

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

@@ -310,19 +310,14 @@
         </where>
     </select>
     <select id="selectAppcustomListPage" resultType="com.logpm.distribution.vo.app.DistributionAppReservationVO">
-        SELECT
-            ldr.id id,
-            ldr.consignee consignee,
-            ldr.reservation_num reservationNum,
-            COALESCE(lds.loaded_number + lds.loadedin_number, 0)  loadingNub,
+        SELECT ldr.id id,  ldr.consignee consignee, ldr.reservation_num reservationNum, COALESCE(lds.loaded_number + lds.loadedin_number, 0)  loadingNub,
             (SELECT COALESCE(COUNT(*), 0) from logpm_distribution_reservation_stockarticle ldrs WHERE ldrs.reservation_id =ldr.id  and ldrs.stock_article_status in (1,3) )   ordNub,
-            COALESCE(lds.received_quantity + lds.receivedin_quantity, 0)  signNub
-        FROM
-            logpm_distribution_signfor lds
-                JOIN logpm_distribution_reservation ldr ON ldr.id = lds.reservation_id and ldr.reservation_status != '40'
-        WHERE
-            lds.is_deleted = 0
-          AND lds.delivery_id = #{id}
+            COALESCE(lds.received_quantity + lds.receivedin_quantity, 0)  signNub, ldsk.stockup_area stockupArea
+        FROM logpm_distribution_signfor lds
+        JOIN logpm_distribution_reservation ldr ON ldr.id = lds.reservation_id and ldr.reservation_status != '40'
+        LEFT JOIN logpm_distribution_stockup_info ldsi on ldr.id =   lds.reservation_id
+        LEFT JOIN logpm_distribution_stockup ldsk on ldsk.id = ldsi.stockup_id
+        WHERE lds.is_deleted = 0 AND lds.delivery_id = #{id}
     </select>
     <select id="selectDistributionAppDeliveryInventoryPage"
             resultType="com.logpm.distribution.vo.app.DistributionAppStockArticleVO">

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

@@ -630,21 +630,12 @@
             logpm_distribution_stock lds on lds.reservation_id = ldsf.reservation_id
         where lddl.reservation_id = #{reservationId} and    lds.coding  =#{barcode}
     </select>
-    <select id="selectDistributionAppDeliveryListPage"
-            resultType="com.logpm.distribution.vo.app.DistributionAppDeliveryListVO">
-        SELECT
-        DISTINCT lddl.id id,
-        lddl.train_number trainNumber,
+    <select id="selectDistributionAppDeliveryListPage"  resultType="com.logpm.distribution.vo.app.DistributionAppDeliveryListVO">
+        SELECT  DISTINCT lddl.id id,  lddl.train_number trainNumber,
         <!--lddl.warehouse_name warehouseName,
         lddl.warehouse_id warehouseId, -->
-        lddl.type type,
-        lddl.kind kind,
-        lddl.vehicle_name vehicleName,
-        lddl.driver_name driverName,
-        lddl.vehicle_id vehicleId,
-        lddl.driver_id driverId,
-        lddl.delivery_status deliveryStatus,
-        lddl.preparation_time preparationTime,
+        lddl.type type,  lddl.kind kind, lddl.vehicle_name vehicleName, lddl.driver_name driverName,
+        lddl.vehicle_id vehicleId, lddl.driver_id driverId, lddl.delivery_status deliveryStatus, lddl.preparation_time preparationTime,
         <!-- lddl.distribution_company distributionCompany,
          lddl.state state,
          (SELECT GROUP_CONCAT(DISTINCT ldsu.forklift_name SEPARATOR ',') FROM
@@ -654,10 +645,8 @@
          join logpm_distribution_stockup ldsu on ldsu.id = ldsi.stockup_id
          WHERE lds.delivery_id = lddl.id
          ) forkliftName, -->
-        lddl.create_time createTime,
-        lddl.customers_number customersNumber,
-        lddl.price price,
-        lddl.added_services_id addedServicesId,
+        lddl.create_time createTime, lddl.customers_number customersNumber,
+        lddl.price price, lddl.added_services_id addedServicesId,
         (SELECT COALESCE (COUNT(*) ,0)
         FROM
         logpm_distribution_signfor lds
@@ -705,6 +694,7 @@
         left join logpm_distribution_delivery_self ldds on lddl.id =ldds.delivery_id
         <where>
             lddl.is_deleted =0
+            <if test=" param.type != null and param.type != ''">and  lddl.type = #{param.type}</if>
             <if test="array != null and @org.apache.commons.collections4.CollectionUtils@isNotEmpty(array)">
                 and lddl.id in
                 <foreach collection="array" item="item" open="(" close=")" separator=",">

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

@@ -518,14 +518,15 @@
             lds.loaded_number loadingNub,
             ldr.delivery_phone deliveryPhone,
             ldr.delivery_address deliveryAddress,
+            ldr.is_urgent isUrgent,
+            ldr.remarks,
+            CASE WHEN lds.positioning IS NOT NULL THEN true ELSE false END AS positioning,
             (SELECT COALESCE(COUNT(*), 0) from logpm_distribution_reservation_stockarticle ldrs WHERE ldrs.reservation_id =ldr.id )   ordNub,
             COALESCE(lds.received_quantity + lds.receivedin_quantity, 0)  signNub
         FROM
             logpm_distribution_signfor lds
                 JOIN logpm_distribution_reservation ldr ON ldr.id = lds.reservation_id
-        WHERE
-            lds.is_deleted = 0
-          AND lds.delivery_id = #{id}
+        WHERE  lds.is_deleted = 0 AND lds.delivery_id = #{id}
     </select>
     <select id="selectord" resultType="com.logpm.distribution.vo.app.DistributionAppStockArticleVO">
         SELECT  distinct

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

@@ -50,6 +50,7 @@ import org.springblade.common.constant.reservation.*;
 import org.springblade.common.constant.stockup.StockAssignStatusConstant;
 import org.springblade.common.constant.stockup.StockupStatusConstant;
 import org.springblade.common.serviceConstant.ServiceConstant;
+import org.springblade.common.utils.CommonUtil;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.mp.support.BladePage;
 import org.springblade.core.mp.support.Condition;
@@ -61,6 +62,7 @@ import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.ObjectUtil;
 import org.springblade.core.tool.utils.RandomType;
+import org.springblade.core.tool.utils.StringUtil;
 import org.springblade.system.feign.IDictBizClient;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
@@ -1125,6 +1127,30 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		}
 		//转换字典字段
 		for (DistributionAppDeliveryListVO distributionAppDeliveryListVO : distributionAppDeliveryListVOS) {
+			//查询备货区
+			if(StringUtils.isNotBlank(distributionAppDeliveryListVO.getReservationId())){
+				List<String> list = CommonUtil.stringNum(distributionAppDeliveryListVO.getReservationId());
+				QueryWrapper<DistributionStockupInfoEntity> queryWrapper = new QueryWrapper();
+
+				if(list.size() > 1){
+					queryWrapper.in("reservation_id",list);
+				}else{
+					queryWrapper.eq("reservation_id",distributionAppDeliveryListVO.getReservationId());
+				}
+				List<DistributionStockupInfoEntity> list1 = distributionStockupInfoService.list(queryWrapper);
+				if(list1.size() > 0){
+					DistributionStockupInfoEntity distributionStockupInfoEntity = list1.get(0);
+					DistributionStockupEntity distributionStockupEntity = distributionStockupMapper.selectById(distributionStockupInfoEntity.getStockupId());
+					if(ObjectUtils.isNotNull(distributionStockupEntity)){
+						distributionAppDeliveryListVO.setStockupArea(distributionStockupEntity.getStockupArea());
+					}else{
+						distributionAppDeliveryListVO.setStockupArea("无数据");
+					}
+				}else{
+					distributionAppDeliveryListVO.setStockupArea("无数据");
+				}
+			}
+
 			//查询包件签收件数
 			Integer lad = distributionLoadscanMapper.selectCount(new QueryWrapper<DistributionLoadscanEntity>().lambda()
 				.eq(DistributionLoadscanEntity::getDeliveryId, distributionAppDeliveryListVO.getId())
@@ -1285,7 +1311,6 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 	public IPage<DistributionAppReservationVO> getAppDeliveryreservationListPage(IPage<DistributionAppReservationVO> page, DistributionAppDeliveryListDTO distributionDeliveryList) {
 		//查询客户
 		List<DistributionAppReservationVO> customList = distributionDeliveryInfoMapper.selectAppcustomListPage(page, distributionDeliveryList.getId());
-
 		for (DistributionAppReservationVO distributionAppReservationVO : customList) {
 			//查询备货是否完成
 			Integer aLong = distributionStockMapper.selectCount(new QueryWrapper<DistributionStockEntity>().lambda()