1.增加创建配送任务 推送商场2

blade-service-api/logpm-business-conversion-api/src/main/java/com/logpm/business/dto/BusinessPreListDTO.java

@@ -0,0 +1,12 @@
+package com.logpm.business.dto;
+
+import lombok.Data;
+
+@Data
+public class BusinessPreListDTO {
+
+	private String reservationCode;
+
+	private Integer inWarehouse;
+
+}

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

@@ -0,0 +1,36 @@
+package com.logpm.distribution.appcontroller;
+
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.logpm.business.dto.BusinessPreListDTO;
+import com.logpm.business.vo.DistributionBusinessPreOrderVO;
+import com.logpm.distribution.service.IDistributionBusinessPreOrderService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springblade.core.tool.api.R;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@AllArgsConstructor
+@RequestMapping("/app/businessPreOrder")
+@Api(value = "配送管理", tags = "配送管理App接口")
+public class DistributionBusinessPreOrderAppController {
+
+	private final IDistributionBusinessPreOrderService distributionBusinessPreOrderService;
+
+	@ResponseBody
+	@PostMapping("/list")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "模糊查询", notes = "传入trayTypeDTO")
+	public R  list(@RequestBody BusinessPreListDTO queryrderDTO){
+
+		List<DistributionBusinessPreOrderVO> data =distributionBusinessPreOrderService.list(queryrderDTO);
+
+		return R.data(data);
+	}
+
+
+
+}

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

@@ -18,6 +18,7 @@ package com.logpm.distribution.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.business.dto.BusinessPreListDTO;
 import com.logpm.business.entity.DistributionBusinessPreOrderEntity;
 import com.logpm.business.vo.DistributionBusinessPreOrderVO;
 import com.logpm.distribution.dto.DistributionBusinessPreOrderDTO;
@@ -50,4 +51,5 @@ public interface DistributionBusinessPreOrderMapper extends BaseMapper<Distribut
 	 */
     IPage<DistributionBusinessPreOrderVO> pageList(IPage<DistributionBusinessPreOrderVO> page, DistributionBusinessPreOrderDTO param);
 
+	List<DistributionBusinessPreOrderEntity> list(@Param("queryrderDTO") BusinessPreListDTO queryrderDTO);
 }

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

@@ -30,16 +30,16 @@
         FROM
         logpm_business_pre_order
         <where>
-            id_deleted = 0
+            is_deleted = 0
             <if test="param.id != null and param.id != ''">
               AND  id = #{param.id}
             </if>
-            <if test="param.ids != null ">
-              AND  id  IN
-                <foreach collection="param.ids" item="item" index="index" open="(" close=")" separator=",">
-                    #{otem}
-                </foreach>
-            </if>
+<!--            <if test="param.ids != null ">-->
+<!--              AND  id  IN-->
+<!--                <foreach collection="param.ids" item="item" index="index" open="(" close=")" separator=",">-->
+<!--                    #{otem}-->
+<!--                </foreach>-->
+<!--            </if>-->
             <if test="param.firsts != null and param.firsts != ''">
                 AND  firsts like concat(#{param.id},'%')
             </if>
@@ -105,4 +105,45 @@
 
 
     </select>
+    <select id="list" resultType="com.logpm.business.entity.DistributionBusinessPreOrderEntity">
+
+        SELECT
+        id,
+        firsts,
+        `SECOND`,
+        third_product,
+        quantity,
+        train_number,
+        order_code,
+        service_number,
+        material_name,
+        material_code,
+        brand_name,
+        waybill_number,
+        dealer_name,
+        dealer_code,
+        send_warehouse_name,
+        accept_warehouse_name,
+        weight,
+        volume,
+        driver_name,
+        vehicle_name,
+        distr_car_number,
+        in_warehouse
+        FROM
+        logpm_business_pre_order
+
+        <where>
+            is_deleted = 0
+            <if test="queryrderDTO.inWarehouse != null and queryrderDTO.inWarehouse != ''">
+                AND  in_warehouse = #{param.inWarehouse}
+            </if>
+
+            <if test="queryrderDTO.reservationCode != null and queryrderDTO.reservationCode != ''">
+                AND  reservation_code = #{queryrderDTO.reservationCode}
+            </if>
+        </where>
+
+    </select>
+
 </mapper>

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionBusinessPreOrderService.java

@@ -1,12 +1,14 @@
 package com.logpm.distribution.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.business.dto.BusinessPreListDTO;
 import com.logpm.business.entity.DistributionBusinessPreOrderEntity;
 import com.logpm.business.vo.DistributionBusinessPreOrderVO;
 import com.logpm.distribution.entity.DistributionBillLadingScanEntity;
 import org.springblade.core.mp.base.BaseService;
 import org.springblade.core.mp.support.Query;
 
+import java.util.List;
 import java.util.Map;
 
 public interface IDistributionBusinessPreOrderService extends BaseService<DistributionBusinessPreOrderEntity> {
@@ -26,4 +28,6 @@ public interface IDistributionBusinessPreOrderService extends BaseService<Distri
 	 */
 	IPage<DistributionBusinessPreOrderVO> pacgeList(Map<String, Object> distributionBusinessPreOrderDTO, IPage<DistributionBusinessPreOrderVO> page);
 
+	List<DistributionBusinessPreOrderVO> list(BusinessPreListDTO queryrderDTO);
+
 }

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

@@ -2,6 +2,7 @@ package com.logpm.distribution.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.business.dto.BusinessPreListDTO;
 import com.logpm.business.entity.DistributionBusinessPreOrderEntity;
 import com.logpm.business.vo.DistributionBusinessPreOrderVO;
 import com.logpm.distribution.dto.DistributionBusinessPreOrderDTO;
@@ -10,6 +11,7 @@ import com.logpm.distribution.mapper.DistributionBusinessPreOrderMapper;
 import com.logpm.distribution.service.IDistributionBusinessPreOrderService;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.utils.BeanUtil;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
@@ -38,6 +40,8 @@ public class IDistributionBusinessPreOrderServiceImpl extends BaseServiceImpl<Di
 		return baseMapper.pageList(page,param);
 	}
 
+
+
 	/**
 	 * 处理包条码到当前租户对应的数据库
 	 * @param codes
@@ -49,5 +53,16 @@ public class IDistributionBusinessPreOrderServiceImpl extends BaseServiceImpl<Di
 		return false;
 	}
 
+	@Override
+	public List<DistributionBusinessPreOrderVO> list(BusinessPreListDTO queryrderDTO) {
+		List<DistributionBusinessPreOrderEntity> data =baseMapper.list(queryrderDTO);
 
+		List<DistributionBusinessPreOrderVO> result = new ArrayList<>();
+		for (DistributionBusinessPreOrderEntity datum : data) {
+			DistributionBusinessPreOrderVO copy = BeanUtil.copy(datum, DistributionBusinessPreOrderVO.class);
+			result.add(copy);
+		}
+
+		return result;
+	}
 }