修改在库运单查询

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

@@ -17,6 +17,7 @@
 package com.logpm.distribution.vo;
 
 import com.logpm.distribution.entity.DistributionStockEntity;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -43,4 +44,10 @@ public class DistributionStockVO extends DistributionStockEntity {
 
 	private Integer whole;//全部
 
+	/**
+	 * 出库类型
+	 */
+	@ApiModelProperty(value = "出库类型")
+	private String outboundTypeName;
+
 }

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

@@ -609,6 +609,7 @@ public class DistributionStockupAppController extends BladeController {
 						}
 						entity.setConditions("0");
 						entity.setType(2);
+						entity.setOutboundType(distributionStockupEntity.getTypeService());
 						distributionStockService.save(entity);
 						//修改订单备货状态
 						distributionAsyncService.updateStockArticleStock(one.getStockArticleId());

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

@@ -25,6 +25,7 @@ import com.logpm.distribution.entity.DistributionStockEntity;
 import com.logpm.distribution.excel.DistributionStockExcel;
 import com.logpm.distribution.service.IDistributionStockService;
 import com.logpm.distribution.vo.DistributionStockVO;
+import com.logpm.distribution.wrapper.DistributionStockWrapper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -76,9 +77,9 @@ public class DistributionStockController extends BladeController  {
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入distributionStock")
-	public R<IPage<DistributionStockEntity>> list(@ApiIgnore @RequestParam Map<String, Object> distributionStock, Query query) {
+	public R<IPage<DistributionStockVO>> list(@ApiIgnore @RequestParam Map<String, Object> distributionStock, Query query) {
 		IPage<DistributionStockEntity> pages = distributionStockService.page(Condition.getPage(query), Condition.getQueryWrapper(distributionStock, DistributionStockEntity.class));
-		return R.data(pages);
+		return R.data(DistributionStockWrapper.build().pageVO(pages));
 	}
 
 	/**

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/wrapper/DistributionStockWrapper.java

@@ -0,0 +1,61 @@
+package com.logpm.distribution.wrapper;
+
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.logpm.distribution.entity.DistributionDeliveryListEntity;
+import com.logpm.distribution.entity.DistributionStockEntity;
+import com.logpm.distribution.entity.DistributionStockListEntity;
+import com.logpm.distribution.entity.DistrilbutionBillLadingEntity;
+import com.logpm.distribution.service.IDistributionDeliveryListService;
+import com.logpm.distribution.service.IDistributionStockListService;
+import com.logpm.distribution.service.IDistrilbutionBillLadingService;
+import com.logpm.distribution.vo.DistributionStockVO;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.log4j.Log4j2;
+import org.springblade.common.constant.DictBizConstant;
+import org.springblade.common.constant.DistributionTypeConstant;
+import org.springblade.core.mp.support.BaseEntityWrapper;
+import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.core.tool.utils.SpringUtil;
+import org.springblade.system.cache.DictBizCache;
+
+import java.util.Objects;
+@Log4j2
+public class DistributionStockWrapper extends BaseEntityWrapper<DistributionStockEntity, DistributionStockVO> {
+
+	private IDistributionStockListService stockListService = SpringUtil.getBean(IDistributionStockListService.class);
+	private IDistributionDeliveryListService deliveryListService = SpringUtil.getBean(IDistributionDeliveryListService.class);
+	private IDistrilbutionBillLadingService billLadingService = SpringUtil.getBean(IDistrilbutionBillLadingService.class);
+
+	public static DistributionStockWrapper build(){
+		return new DistributionStockWrapper();
+	}
+
+
+	@Override
+	public DistributionStockVO entityVO(DistributionStockEntity entity) {
+
+		DistributionStockVO distributionStockVO = new DistributionStockVO();
+		if(ObjectUtils.isNotNull(distributionStockVO)){
+			//查询订单自编号
+			if (ObjectUtils.isNotNull(entity.getStockListId())) {
+				DistributionStockListEntity byId = stockListService.getById(entity.getStockListId());
+				if(byId.getSourceType().equals("1")){
+					entity.setOrderSelfNumbering(byId.getIncomingBatch());
+				}
+			}
+
+			if(DistributionTypeConstant.ziti.getValue().equals(entity.getOutboundType())){
+				DistrilbutionBillLadingEntity byId1 = billLadingService.getById(entity.getBillLadingId());
+				entity.setDeliveryListCode(byId1.getPickupBatch());
+			}else{
+				DistributionDeliveryListEntity byId1 = deliveryListService.getById(entity.getReservationId());
+				entity.setDeliveryListCode(byId1.getNoteNumber());
+			}
+			distributionStockVO = Objects.requireNonNull(BeanUtil.copy(entity,DistributionStockVO.class));
+			distributionStockVO.setOutboundTypeName(DictBizCache.getValue(DictBizConstant.DISTRIBUTION_TYPE, entity.getOutboundType()));
+		}
+
+
+		return distributionStockVO;
+	}
+}

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

@@ -97,17 +97,18 @@ public class WarehouseWaybillController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入warehouseWaybill")
 	public R<IPage<WarehouseWaybillVO>> list(@ApiIgnore @RequestParam Map<String, Object> warehouseWaybill, Query query) {
-		QueryWrapper<WarehouseWaybillEntity> queryWrapper = Condition.getQueryWrapper(warehouseWaybill, WarehouseWaybillEntity.class);
-		//获取当前登录人仓库
-		List<BasicdataWarehouseEntity> myWatchWarehouse = basicdataWarehouseClient.getMyWatchWarehouse();
-		List<Long> collect = myWatchWarehouse.stream()
-			.map(BasicdataWarehouseEntity::getId)
-			.collect(Collectors.toList());
-		queryWrapper.lambda()
-			.in(collect.size() > 0, WarehouseWaybillEntity::getDepartureWarehouseId, collect)
-			.or()
-			.in(collect.size() > 0, WarehouseWaybillEntity::getDestinationWarehouseId, collect);
-		IPage<WarehouseWaybillEntity> pages = warehouseWaybillService.page(Condition.getPage(query), queryWrapper);
+//		QueryWrapper<WarehouseWaybillEntity> queryWrapper = Condition.getQueryWrapper(warehouseWaybill, WarehouseWaybillEntity.class);
+//		//获取当前登录人仓库
+//		List<BasicdataWarehouseEntity> myWatchWarehouse = basicdataWarehouseClient.getMyWatchWarehouse();
+//		List<Long> collect = myWatchWarehouse.stream()
+//			.map(BasicdataWarehouseEntity::getId)
+//			.collect(Collectors.toList());
+//		queryWrapper.lambda()
+//			.in(collect.size() > 0, WarehouseWaybillEntity::getDepartureWarehouseId, collect)
+//			.or()
+//			.in(collect.size() > 0, WarehouseWaybillEntity::getDestinationWarehouseId, collect);
+
+		IPage<WarehouseWaybillEntity> pages = warehouseWaybillService.pageInfo(Condition.getPage(query), warehouseWaybill);
 		return R.data(WarehouseWaybillWrapper.build().pageVO(pages));
 	}
 

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/WarehouseWaybillDTO.java

@@ -20,6 +20,8 @@ import com.logpm.warehouse.entity.WarehouseWaybillEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.List;
+
 /**
  * 运单表 数据传输对象实体类
  *
@@ -31,4 +33,8 @@ import lombok.EqualsAndHashCode;
 public class WarehouseWaybillDTO extends WarehouseWaybillEntity {
 	private static final long serialVersionUID = 1L;
 
+	private List<Long> departureWarehouseIds;
+
+	private List<Long> destinationWarehouseIds;
+
 }

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

@@ -59,11 +59,11 @@ public interface TaskQuestMapper extends BaseMapper<TaskQuestEntity> {
 
 	List<TaskallocationVO> selectallocationList(@Param("questNum")String questNum, @Param("param")  TaskSearchDTO taskSearchDTO);
 
-	List<TaskContractVO> selectcontractList(IPage<TaskContractVO> page, @Param("param")  TaskSearchDTO taskSearchDTO,@Param("collect") List<Long> collect);
+	List<TaskContractVO> selectcontractList(IPage<TaskContractVO> page, @Param("param")  TaskSearchDTO taskSearchDTO,@Param("collect") List<Long> collect,@Param("questNum") String questNum );
 
 	void setSqlMode();
 
-	List<TaskTrayVO> selecttrayList(IPage<TaskTrayVO> page,@Param("param") TaskSearchDTO taskSearchDTO,@Param("collect") List<Long> collect);
+	List<TaskTrayVO> selecttrayList(IPage<TaskTrayVO> page,@Param("param") TaskSearchDTO taskSearchDTO,@Param("collect") List<Long> collect,@Param("questNum") String questNum);
 
 	/**
 	 * 查询包件托盘码
@@ -81,11 +81,12 @@ public interface TaskQuestMapper extends BaseMapper<TaskQuestEntity> {
 
     List<WarehouseMaterialVO> findMaterialList(@Param("param") TaskSearchDTO taskSearchDTO);
 
-	List<QuestDetailVO> selectStripListByQuestId(IPage<QuestDetailVO> page,@Param("questId") Long id);
+	List<QuestDetailVO> selectStripListByQuestId(IPage<QuestDetailVO> page,@Param("questId") Long id,@Param("questNum") String questNum);
 
-	List<QuestDetailVO> selectInventoryListByQuestId(IPage<QuestDetailVO> page,@Param("questId") Long id);
 
-	List<QuestDetailVO> selectZeroListByQuestId(IPage<QuestDetailVO> page,@Param("questId") Long id);
+	List<QuestDetailVO> selectInventoryListByQuestId(IPage<QuestDetailVO> page,@Param("questId") Long id,@Param("questNum") String questNum);
+
+	List<QuestDetailVO> selectZeroListByQuestId(IPage<QuestDetailVO> page,@Param("questId") Long id,@Param("questNum") String questNum);
 
 
     String selectExitsInfo(@Param("questNum")String questNum);
@@ -121,9 +122,27 @@ public interface TaskQuestMapper extends BaseMapper<TaskQuestEntity> {
 
 	List<QuestDetailEntity> selectTaskTrayInfo(IPage<Object> page,@Param("questNum")String questNum,@Param("param") QuestDetailEntity questDetail);
 
-	List<QuestDetailChildEntity> getQuestDetailInfo(@Param("questNum")String questNum,@Param("param")QuestDetailChildEntity questDetailChildEntity);
+	/**
+	 *
+	 * @param questNum
+	 * @param questDetailChildEntity
+	 * @return
+	 */
+	List<QuestDetailChildEntity> selectQuestDetailChildInfo(@Param("questNum")String questNum, @Param("param")QuestDetailChildEntity questDetailChildEntity);
+	QuestDetailChildEntity selectQuestDetailChildInfoOne(@Param("questNum")String questNum, @Param("param")QuestDetailChildEntity questDetailChildEntity);
 
 	Integer updateQuestDetailQuestStatus(@Param("questNum")String questNum,@Param("param") QuestDetailEntity q);
 
 	Integer updatePositionCodeList(@Param("questNum") String questNum, @Param("list") List<QuestDetailEntity> ls);
+
+	Integer insertQuestDetailChildList(@Param("questNum")String questNum,@Param("list") List<QuestDetailChildEntity> q);
+
+	/**
+	 *
+	 * @param questNum
+	 * @param q
+	 * @return
+	 */
+	Integer updetaQuestDetailChildList(@Param("questNum")String questNum,@Param("list") List<QuestDetailChildEntity> q);
+
 }

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

@@ -215,12 +215,50 @@
                   <if test="item. != null and item. != null"> = #{item. }</if>
                   <if test="item. != null and item. != null"> = #{item. }</if>-->
             </set>
-            WHERE `id` = #{ param.id }
+            WHERE `id` = #{ item.id }
         </foreach>
 
     </update>
+    <update id="updetaQuestDetailChildList">
+        <foreach collection="list" item="item" index="index">
+            update ${questNum}
+            <set>
+                <if test="item.cargoName != null and item.cargoName != ''" > cargo_name = #{item.cargoName }, </if>
+                <if test="item.questNum != null and item.questNum != ''" >quest_num = #{item.questNum }, </if>
+<!--                <if test="item. != null and item. != ''" > = #{item. }, </if>-->
+<!--                <if test="item. != null and item. != ''" > = #{item. }, </if>-->
+<!--                <if test="item. != null and item. != ''" > = #{item. }, </if>-->
+<!--                <if test="item. != null and item. != ''" > = #{item. }, </if>-->
+<!--                <if test="item. != null and item. != ''" > = #{item. }, </if>-->
+<!--                <if test="item. != null and item. != ''" > = #{item. }, </if>-->
+<!--                <if test="item. != null and item. != ''" > = #{item. }, </if>-->
+            </set>
+            WHERE `id` = #{ item.id }
+        </foreach>
+    </update>
+    <insert id="insertQuestDetailChildList">
+        INSERT INTO ${questNum} (`id`, `tenant_id`, `create_user`, `create_time`, `update_user`, `update_time`,
+        `create_dept`, `is_deleted`, `status`, `reserve1`, `reserve2`, `reserve3`, `reserve4`, `reserve5`, `quest_detail_id`, `cargo_name`,
+        `quest_num`, `warehouse_id`)
+        VALUES
+        <foreach collection="list" separator="," item="item" >
+            (#{item.id}, #{item.tenantId}, #{item.createUser}, #{item.createTime}, #{item.updateUser}, #{item.updateTime}, #{item.createDept}, #{item.isDeleted}
+            , #{item.status}, #{item.reserve1}, #{item.reserve2}, #{item.reserve3}, #{item.reserve4}, #{item.reserve5},
+            #{item.questDetailId}, #{item.cargoName}, #{item.questNum} , #{item.warehouseId} )
+        </foreach>
+
+    </insert>
 
-    <select id="getQuestDetailInfo" resultType="com.logpm.warehouse.entity.QuestDetailChildEntity">
+    <select id="selectQuestDetailChildInfo" resultType="com.logpm.warehouse.entity.QuestDetailChildEntity">
+        select *
+        from ${questNum}
+        <where>
+            is_deleted = 0
+            <if test="param.questDetailId  != null and param.questDetailId != ''">and quest_detail_id = #{param.questDetailId } </if>
+            <if test="param.warehouseId  != null and param.warehouseId != ''">and warehouse_id = #{param.warehouseId } </if>
+        </where>
+    </select>
+    <select id="selectQuestDetailChildInfoOne" resultType="com.logpm.warehouse.entity.QuestDetailChildEntity">
         select *
         from ${questNum}
         <where>
@@ -268,7 +306,7 @@
             lqd.order_code orderCode,
             sum(lqd.stock_num) unTotal
         FROM
-        logpm_quest_detail lqd
+        ${questNum} lqd
         <where>
         lqd.quest_type =3 and lqd.is_deleted =0 and (lqd.quest_status = 0 or lqd.quest_status = 1)
             <if test="collect != null and @org.apache.commons.collections4.CollectionUtils@isNotEmpty(collect)">
@@ -291,7 +329,7 @@
             lqd.quest_status questStatus
              lqd.stock_num  stockNum
         FROM
-            logpm_quest_detail lqd
+            ${questNum} lqd
         <where>
             lqd.quest_type = 4 AND lqd.is_deleted =0 and (lqd.quest_status = 0 or lqd.quest_status = 1)
             <if test="param.taskId != null and param.taskId != ''"> and lqd.taskId = #{param.taskId} </if>
@@ -332,6 +370,7 @@
     <select id="selectStripListByQuestId" resultType="com.logpm.warehouse.vo.QuestDetailVO">
         SELECT
         lqd.id id,
+        lqd.id id,
         lqd.order_code orderCode,
         lqd.quest_id questId,
         lqd.order_id orderId,
@@ -352,7 +391,7 @@
         ldpl.send_warehouse_name sendWarehouseName,
         ldsa.consignee_unit consigneeUnit
         FROM
-            logpm_quest_detail lqd
+            ${questNum} lqd
                 JOIN logpm_distribution_parcel_list ldpl ON lqd.order_package_id = ldpl.id
                 left join logpm_distribution_stock_article ldsa on ldsa.id = ldpl.stock_article_id
                 AND lqd.quest_target =1
@@ -375,7 +414,7 @@
         ldsl.service_number serviceNumber,
         ldsl.description_goods descriptionGoods
         FROM
-            logpm_quest_detail lqd
+                ${questNum} lqd
                 JOIN logpm_distribution_stock_list ldsl ON lqd.stock_id = ldsl.id
                 AND lqd.quest_target =3
         <where>
@@ -398,7 +437,7 @@
         ldsa.consignee_address consigneeAddress,
         ldsa.consignee_mobile consigneeMobile
         FROM
-        logpm_quest_detail lqd
+        ${questNum} lqd
         JOIN logpm_distribution_stock_article ldsa ON lqd.order_id = ldsa.id
         AND lqd.quest_target =2
         <where>

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

@@ -19,6 +19,7 @@ package com.logpm.warehouse.mapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.warehouse.dto.WarehouseWaybillDTO;
 import com.logpm.warehouse.entity.WarehouseWaybillEntity;
 import com.logpm.warehouse.vo.WarehouseWaybillVO;
 import org.apache.ibatis.annotations.Param;
@@ -45,4 +46,6 @@ public interface WarehouseWaybillMapper extends BaseMapper<WarehouseWaybillEntit
     void submitStockCount(@Param("orderSelfNumbering") String orderSelfNumbering, @Param("allNum") Integer allNum);
 
     List<WarehouseWaybillVO> exportWarehouseWarehousingDetail(@Param("ew") QueryWrapper<WarehouseWaybillEntity> queryWrapper);
+
+	IPage<WarehouseWaybillEntity> pageInfo(IPage<Object> page,@Param("param") WarehouseWaybillDTO warehouseWaybillDTO);
 }

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

@@ -60,6 +60,74 @@
     <select id="selectWarehouseWaybillPage" resultMap="warehouseWaybillResultMap">
         select * from logpm_warehouse_waybill where is_deleted = 0
     </select>
+    <select id="pageInfo" resultType="com.logpm.warehouse.vo.WarehouseWaybillVO">
+        select *
+        from logpm_warehouse_waybill
+        <where>
+            <if test="param.waybillNo != null and param.waybillNo != ''"> and waybill_no like concat('%',#{param.waybillNo },'%')</if>
+            <if test="param.orderNo != null and param.orderNo != ''">and order_no like concat('%',#{param.orderNo }</if>
+            <if test="param.departureWarehouseName != null and param.departureWarehouseName != ''">and departure_warehouse_name like concat('%',#{param.departureWarehouseName },'%')</if>
+            <if test="param.destinationWarehouseName != null and param.destinationWarehouseName != ''">and destination_warehouse_name like concat('%',#{param.destinationWarehouseName },'%')</if>
+            <if test="param.customerTrain != null and param.customerTrain != ''">and customer_train like concat('%',#{param.customerTrain },'%')</if>
+            <if test="param.brand != null and param.brand != ''">and brand like concat('%',#{param.brand },'%')</if>
+            <if test="param.shipper != null and param.shipper != ''">and shipperlike concat('%',#{param.shipper },'%')</if>
+            <if test="param.shipperName != null and param.shipperName != ''">and shipper_name like concat('%',#{param.shipperName },'%')</if>
+            <if test="param.shipperMobile != null and param.shipperMobile != ''">and shipper_mobile like concat('%',#{param.shipperMobile },'%')</if>
+            <if test="param.shipperAddress != null and param.shipperAddress != ''">and shipper_address like concat('%',#{param.shipperAddress },'%')</if>
+            <if test="param.consignee != null and param.consignee != ''">and consignee like concat('%',#{param.consignee },'%')</if>
+            <if test="param.consigneeName != null and param.consigneeName != ''">and consignee_name like concat('%',#{param.consigneeName  },'%')</if>
+            <if test="param.consigneeMobile != null and param.consigneeMobile != ''">and consignee_mobile like concat('%',#{param.consigneeMobile },'%')</if>
+            <if test="param.consigneeAddress != null and param.consigneeAddress != ''">and consignee_address like concat('%',#{param.consigneeAddress },'%')</if>
+            <if test="param.destination != null and param.destination != ''">and destination like concat('%',#{param.destination },'%')</if>
+            <if test="param.goodsName != null and param.goodsName != ''">and goods_name like concat('%',#{param.goodsName  },'%')</if>
+            <if test="param.stats != null and param.stats != ''">and stats =#{param.stats }</if>
+            <if test="param.freezeStatus != null and param.freezeStatus != ''">and freeze_status =#{param.freezeStatus }</if>
+            <if test="param.serviceNo != null and param.serviceNo != ''">and service_no like concat('%',#{param.serviceNo },'%')</if>
+            <if test="param.serviceType != null and param.serviceType != ''">and service_type = #{param.serviceType }</if>
+            <if test="param.batchNo != null and param.batchNo != ''">and batch_no like concat('%',#{param.batchNo },'%')</if>
+            <if test="param.agent != null and param.agent != ''">and agent like concat('%', #{param.agent },'%')</if>
+            <if test="param.receiptRequirement != null and param.receiptRequirement != ''">and receipt_requirement like concat('%',#{param.receiptRequirement },'%')</if>
+            <if test="param.deliveryMethod != null and param.deliveryMethod != ''">and delivery_method like concat('%',#{param.deliveryMethod },'%')</if>
+            <if test="param.urgency != null and param.urgency != ''">and urgency like concat('%',#{param.urgency },'%')</if>
+            <if test="param.departureWarehouseIds != null">
+                and  departure_warehouse_id in
+                <foreach collection="param.departureWarehouseIds" item="a" close=")" open="(" separator=",">
+                    #{a}
+                </foreach>
+            </if>
+            <if test="param.destinationWarehouseIds != null">
+                or destination_warehouse_id in
+                <foreach collection="param.destinationWarehouseIds" item="a" close=")" open="(" separator=",">
+                    #{a}
+                </foreach>
+            </if>
+            <if test="param.waybillNo != null and param.waybillNo != ''"> and waybill_no like concat('%',#{param.waybillNo },'%')</if>
+            <if test="param.orderNo != null and param.orderNo != ''">and order_no like concat('%',#{param.orderNo }</if>
+            <if test="param.departureWarehouseName != null and param.departureWarehouseName != ''">and departure_warehouse_name like concat('%',#{param.departureWarehouseName },'%')</if>
+            <if test="param.destinationWarehouseName != null and param.destinationWarehouseName != ''">and destination_warehouse_name like concat('%',#{param.destinationWarehouseName },'%')</if>
+            <if test="param.customerTrain != null and param.customerTrain != ''">and customer_train like concat('%',#{param.customerTrain },'%')</if>
+            <if test="param.brand != null and param.brand != ''">and brand like concat('%',#{param.brand },'%')</if>
+            <if test="param.shipper != null and param.shipper != ''">and shipperlike concat('%',#{param.shipper },'%')</if>
+            <if test="param.shipperName != null and param.shipperName != ''">and shipper_name like concat('%',#{param.shipperName },'%')</if>
+            <if test="param.shipperMobile != null and param.shipperMobile != ''">and shipper_mobile like concat('%',#{param.shipperMobile },'%')</if>
+            <if test="param.shipperAddress != null and param.shipperAddress != ''">and shipper_address like concat('%',#{param.shipperAddress },'%')</if>
+            <if test="param.consignee != null and param.consignee != ''">and consignee like concat('%',#{param.consignee },'%')</if>
+            <if test="param.consigneeName != null and param.consigneeName != ''">and consignee_name like concat('%',#{param.consigneeName  },'%')</if>
+            <if test="param.consigneeMobile != null and param.consigneeMobile != ''">and consignee_mobile like concat('%',#{param.consigneeMobile },'%')</if>
+            <if test="param.consigneeAddress != null and param.consigneeAddress != ''">and consignee_address like concat('%',#{param.consigneeAddress },'%')</if>
+            <if test="param.destination != null and param.destination != ''">and destination like concat('%',#{param.destination },'%')</if>
+            <if test="param.goodsName != null and param.goodsName != ''">and goods_name like concat('%',#{param.goodsName  },'%')</if>
+            <if test="param.stats != null and param.stats != ''">and stats =#{param.stats }</if>
+            <if test="param.freezeStatus != null and param.freezeStatus != ''">and freeze_status =#{param.freezeStatus }</if>
+            <if test="param.serviceNo != null and param.serviceNo != ''">and service_no like concat('%',#{param.serviceNo },'%')</if>
+            <if test="param.serviceType != null and param.serviceType != ''">and service_type = #{param.serviceType }</if>
+            <if test="param.batchNo != null and param.batchNo != ''">and batch_no like concat('%',#{param.batchNo },'%')</if>
+            <if test="param.agent != null and param.agent != ''">and agent like concat('%', #{param.agent },'%')</if>
+            <if test="param.receiptRequirement != null and param.receiptRequirement != ''">and receipt_requirement like concat('%',#{param.receiptRequirement },'%')</if>
+            <if test="param.deliveryMethod != null and param.deliveryMethod != ''">and delivery_method like concat('%',#{param.deliveryMethod },'%')</if>
+            <if test="param.urgency != null and param.urgency != ''">and urgency like concat('%',#{param.urgency },'%')</if>
+        </where>
+    </select>
 
     <select id="exportWarehouseWarehousingDetail" resultType="com.logpm.warehouse.vo.WarehouseWaybillVO">
         select * from logpm_warehouse_waybill ${ew.customSqlSegment}

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseWaybillService.java

@@ -44,4 +44,6 @@ public interface IWarehouseWaybillService extends BaseService<WarehouseWaybillEn
 	 * @return
 	 */
     List<WarehouseWaybillExcel> exportWarehouseWarehousingDetail(Map<String, Object> warehouseWaybillEntity);
+
+	IPage<WarehouseWaybillEntity> pageInfo(IPage<Object> page, Map<String, Object> warehouseWaybill);
 }

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

@@ -46,7 +46,6 @@ import com.logpm.warehouse.vo.*;
 import lombok.AllArgsConstructor;
 import lombok.extern.log4j.Log4j2;
 import org.springblade.common.constant.common.IsOrNoConstant;
-import org.springblade.common.constant.orderpackage.OrderPackageStatusConstant;
 import org.springblade.common.exception.CustomerException;
 import org.springblade.common.utils.CommonUtil;
 import org.springblade.core.log.exception.ServiceException;
@@ -92,7 +91,7 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 
 	private final IDistributionParcelListClient distributionParcelListClient;
 
-	private final IQuestDetailChildService questDetailChildService;
+	private final IQuestDetailChildService questDetailChildServic;
 
 	private final IBasicdataGoodsAllocationClient basicdataGoodsAllocationClient;
 	private final IBasicdataGoodsShelfClient basicdataGoodsShelfClient;
@@ -888,7 +887,7 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 
 	public List<QuestDetailChildEntity> getQuestDetailInfo(String questNum, QuestDetailChildEntity questDetailChildEntity){
 
-		return baseMapper.getQuestDetailInfo(questNum,questDetailChildEntity);
+		return baseMapper.selectQuestDetailChildInfo(questNum,questDetailChildEntity);
 	}
 
 
@@ -1324,14 +1323,18 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 			Integer wornNum = questDetailDTO.getWornNum();
 			Integer noReceivedNum = questDetailDTO.getNoReceivedNum();
 			Integer noRepairNum = questDetailDTO.getNoRepairNum();
+//			TaskQuestEntity taskQuestEntity = baseMapper.selectById(questId);
+
 			List<QuestDetailChildEntity> childList = new ArrayList<>();
-			childList.add(addQuestDetailChild(stockNum,"10",questDetaiId,warehouseId));
-			childList.add(addQuestDetailChild(wornNum,"20",questDetaiId,warehouseId));
-			childList.add(addQuestDetailChild(lossNum,"30",questDetaiId,warehouseId));
-			childList.add(addQuestDetailChild(noRepairNum,"40",questDetaiId,warehouseId));
-			childList.add(addQuestDetailChild(deliveNum,"50",questDetaiId,warehouseId));
-			childList.add(addQuestDetailChild(noReceivedNum,"60",questDetaiId,warehouseId));
-			questDetailChildService.saveOrUpdateBatch(childList);
+			childList.add(addQuestDetailChild(stockNum,"10",questDetaiId,warehouseId,taskQuestEntity.getQuestNum()));
+			childList.add(addQuestDetailChild(wornNum,"20",questDetaiId,warehouseId,taskQuestEntity.getQuestNum()));
+			childList.add(addQuestDetailChild(lossNum,"30",questDetaiId,warehouseId,taskQuestEntity.getQuestNum()));
+			childList.add(addQuestDetailChild(noRepairNum,"40",questDetaiId,warehouseId,taskQuestEntity.getQuestNum()));
+			childList.add(addQuestDetailChild(deliveNum,"50",questDetaiId,warehouseId,taskQuestEntity.getQuestNum()));
+			childList.add(addQuestDetailChild(noReceivedNum,"60",questDetaiId,warehouseId,taskQuestEntity.getQuestNum()));
+			//修改
+			baseMapper.updetaQuestDetailChildList(taskQuestEntity.getQuestNum(),childList);
+//			questDetailChildService.saveOrUpdateBatch(childList);
 			detailEntity.setQuestStatus(1);
 			//修改状态
 			QuestDetailEntity q = new QuestDetailEntity();
@@ -1572,13 +1575,15 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 		Integer noReceivedNum = 0;
 		Integer noRepairNum = 0;
 		List<QuestDetailChildEntity> childList = new ArrayList<>();
-		childList.add(addQuestDetailChild(stockNum,"10",questDetailId,warehouseId));
-		childList.add(addQuestDetailChild(wornNum,"20",questDetailId,warehouseId));
-		childList.add(addQuestDetailChild(lossNum,"30",questDetailId,warehouseId));
-		childList.add(addQuestDetailChild(noRepairNum,"40",questDetailId,warehouseId));
-		childList.add(addQuestDetailChild(deliveNum,"50",questDetailId,warehouseId));
-		childList.add(addQuestDetailChild(noReceivedNum,"60",questDetailId,warehouseId));
-		questDetailChildService.saveOrUpdateBatch(childList);
+		childList.add(addQuestDetailChild(stockNum,"10",questDetailId,warehouseId,taskSearchDTO.getQuestNum()));
+		childList.add(addQuestDetailChild(wornNum,"20",questDetailId,warehouseId,taskSearchDTO.getQuestNum()));
+		childList.add(addQuestDetailChild(lossNum,"30",questDetailId,warehouseId,taskSearchDTO.getQuestNum()));
+		childList.add(addQuestDetailChild(noRepairNum,"40",questDetailId,warehouseId,taskSearchDTO.getQuestNum()));
+		childList.add(addQuestDetailChild(deliveNum,"50",questDetailId,warehouseId,taskSearchDTO.getQuestNum()));
+		childList.add(addQuestDetailChild(noReceivedNum,"60",questDetailId,warehouseId,taskSearchDTO.getQuestNum()));
+		//新增
+		baseMapper.insertQuestDetailChildList(taskSearchDTO.getQuestNum(),childList);
+//		questDetailChildService.saveOrUpdateBatch(childList);
 	}
 
 	@Override
@@ -1691,15 +1696,20 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 
 	@Override
 	public IPage<QuestDetailVO> selectStrip(IPage<QuestDetailVO> page,Long id) {
-		List <QuestDetailVO> questDetailVOList = baseMapper.selectStripListByQuestId(page,id);
+		TaskQuestEntity taskQuestEntity = baseMapper.selectById(id);
+
+		List <QuestDetailVO> questDetailVOList = baseMapper.selectStripListByQuestId(page,id,taskQuestEntity.getQuestNum());
 		if (!questDetailVOList.isEmpty()){
 		for (QuestDetailVO questDetailVO : questDetailVOList) {
 			//查询子表
 //			TaskQuestEntity taskQuestEntity = baseMapper.selectById();
-			List<QuestDetailChildEntity> list = questDetailChildService.list(new QueryWrapper<QuestDetailChildEntity>().lambda()
-				.eq(QuestDetailChildEntity::getIsDeleted,0)
-				.eq(QuestDetailChildEntity::getQuestDetailId,questDetailVO.getId())
-			);
+			QuestDetailChildEntity questDetailChildEntity = new QuestDetailChildEntity();
+			questDetailChildEntity.setQuestDetailId(questDetailVO.getId());
+			List<QuestDetailChildEntity> list =baseMapper.selectQuestDetailChildInfo(taskQuestEntity.getQuestNum(),questDetailChildEntity);
+//			List<QuestDetailChildEntity> list = questDetailChildService.list(new QueryWrapper<QuestDetailChildEntity>().lambda()
+//				.eq(QuestDetailChildEntity::getIsDeleted,0)
+//				.eq(QuestDetailChildEntity::getQuestDetailId,questDetailVO.getId())
+//			);
 			questDetailVO.setList(list);
 		}
 		}
@@ -1708,14 +1718,18 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 
 	@Override
 	public IPage<QuestDetailVO> selectInventory(IPage<QuestDetailVO> page,Long id) {
-		List<QuestDetailVO> questDetailVOList = baseMapper.selectInventoryListByQuestId(page,id);
+		TaskQuestEntity taskQuestEntity = baseMapper.selectById(id);
+		List<QuestDetailVO> questDetailVOList = baseMapper.selectInventoryListByQuestId(page,id,taskQuestEntity.getQuestNum() );
 		if (!questDetailVOList.isEmpty()){
 			for (QuestDetailVO questDetailVO : questDetailVOList) {
 				//查询子表
-				List<QuestDetailChildEntity> list = questDetailChildService.list(new QueryWrapper<QuestDetailChildEntity>().lambda()
-					.eq(QuestDetailChildEntity::getIsDeleted,0)
-					.eq(QuestDetailChildEntity::getQuestDetailId,questDetailVO.getId())
-				);
+				QuestDetailChildEntity questDetailChildEntity = new QuestDetailChildEntity();
+				questDetailChildEntity.setQuestDetailId(questDetailVO.getId());
+				List<QuestDetailChildEntity> list =baseMapper.selectQuestDetailChildInfo(taskQuestEntity.getQuestNum(),questDetailChildEntity);
+//				 questDetailChildService.list(new QueryWrapper<QuestDetailChildEntity>().lambda()
+//					.eq(QuestDetailChildEntity::getIsDeleted,0)
+//					.eq(QuestDetailChildEntity::getQuestDetailId,questDetailVO.getId())
+//				);
 				questDetailVO.setList(list);
 			}
 		}
@@ -1724,14 +1738,18 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 
 	@Override
 	public IPage<QuestDetailVO> selectZero(IPage<QuestDetailVO> page,Long id) {
-		List<QuestDetailVO> questDetailVOList = baseMapper.selectZeroListByQuestId(page,id);
+		TaskQuestEntity taskQuestEntity = baseMapper.selectById(id);
+		List<QuestDetailVO> questDetailVOList = baseMapper.selectZeroListByQuestId(page,id,taskQuestEntity.getQuestNum() );
 		if (!questDetailVOList.isEmpty()){
 			for (QuestDetailVO questDetailVO : questDetailVOList) {
 				//查询子表
-				List<QuestDetailChildEntity> list = questDetailChildService.list(new QueryWrapper<QuestDetailChildEntity>().lambda()
-					.eq(QuestDetailChildEntity::getIsDeleted,0)
-					.eq(QuestDetailChildEntity::getQuestDetailId,questDetailVO.getId())
-				);
+				QuestDetailChildEntity questDetailChildEntity = new QuestDetailChildEntity();
+				questDetailChildEntity.setQuestDetailId(questDetailVO.getId());
+				List<QuestDetailChildEntity> list =baseMapper.selectQuestDetailChildInfo(taskQuestEntity.getQuestNum(),questDetailChildEntity);
+//				List<QuestDetailChildEntity> list = questDetailChildService.list(new QueryWrapper<QuestDetailChildEntity>().lambda()
+//					.eq(QuestDetailChildEntity::getIsDeleted,0)
+//					.eq(QuestDetailChildEntity::getQuestDetailId,questDetailVO.getId())
+//				);
 				questDetailVO.setList(list);
 			}
 		}
@@ -1828,7 +1846,7 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 	}
 
 
-	private QuestDetailChildEntity addQuestDetailChild(Integer num,String cargoName,Long questDetaiId,Long warehouseId){
+	private QuestDetailChildEntity addQuestDetailChild(Integer num,String cargoName,Long questDetaiId,Long warehouseId,String qu){
 
 		if(Objects.isNull(questDetaiId)){
 			log.warn("###########addQuestDetailChild: 明细id不存在 questDetaiId={}",questDetaiId);
@@ -1844,7 +1862,10 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 		queryWrapper.eq("quest_detail_id",questDetaiId)
 			.eq("cargo_name",cargoName)
 			.eq("is_deleted",0);
-		QuestDetailChildEntity questDetailChildEntity = questDetailChildService.getOne(queryWrapper);
+		QuestDetailChildEntity questDetailChild = new QuestDetailChildEntity();
+
+
+		QuestDetailChildEntity questDetailChildEntity = baseMapper.selectQuestDetailChildInfoOne(qu,questDetailChild);
 		if(Objects.isNull(questDetailChildEntity)){
 			questDetailChildEntity = new QuestDetailChildEntity();
 			questDetailChildEntity.setQuestDetailId(questDetaiId);
@@ -1893,9 +1914,11 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 		verifyTask(taskQuestId, taskSearchDTO.getWarehouseId());
 		TaskQuestEntity taskQuestEntity = baseMapper.selectById(taskQuestId);
 		taskSearchDTO.setQuestNum(taskQuestEntity.getQuestNum());
+
 		List<TaskQuestChildEntity> taskQuestChildEntityList = taskQuestChildService.list(Wrappers.<TaskQuestChildEntity>query().lambda()
 			.eq(TaskQuestChildEntity::getQuestId, taskQuestId)
 			.eq(TaskQuestChildEntity::getRefType, 1));
+
 		List<DistributionStockArticleEntity> stockArticleEntity = null;
 		List<String> marketNames = null;
 		if (Func.isNotEmpty(taskQuestChildEntityList)){

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

@@ -407,8 +407,14 @@ public class WarehouseWarehousingEntryServiceImpl extends BaseServiceImpl<Wareho
 					entryEntity.setReceiptBatch(o.getReceiptBatch());
 				}
 				entryEntity.setReceiptDate(o.getReceiptDate());
-
+				//入库批次号
+				if(ObjectUtils.isNull( o.getReceiptBatch() )){
+					long time = new Date().getTime();
+					BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse();
+					entryEntity.setReceiptBatch("RK"+myCurrentWarehouse.getWarehouseCode()+time);
+				}
 				entryEntity.setConditions("1");
+//				entryEntity.setReceiptBatch("1");
 				BasicdataClientEntity customer = basicdataClientClient.getCustomer(o.getCustomerName(), o.getCustomerCode());
 				if(ObjectUtils.isNotEmpty(customer) ){
 					if(StringUtils.isNotBlank(o.getStoreName())){

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

@@ -1,6 +1,8 @@
 package com.logpm.warehouse.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
@@ -22,6 +24,7 @@ import com.logpm.oldproject.feign.IWayBillClient;
 import com.logpm.oldproject.feign.IWaybillDesClient;
 import com.logpm.warehouse.dto.ProductDTO;
 import com.logpm.warehouse.dto.SplitOrderDTO;
+import com.logpm.warehouse.dto.WarehouseWaybillDTO;
 import com.logpm.warehouse.dto.WaybillDTO;
 import com.logpm.warehouse.entity.WarehouseWayBillDetail;
 import com.logpm.warehouse.entity.WarehouseWaybillEntity;
@@ -659,4 +662,24 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl<WarehouseWaybil
 		});
 		return list;
 	}
+
+	@Override
+	public IPage<WarehouseWaybillEntity> pageInfo(IPage<Object> page, Map<String, Object> warehouseWaybill) {
+		WarehouseWaybillDTO warehouseWaybillDTO = JSON.parseObject(JSONObject.toJSONString(warehouseWaybill), WarehouseWaybillDTO.class);
+//		QueryWrapper<WarehouseWaybillEntity> queryWrapper = Condition.getQueryWrapper(warehouseWaybill, WarehouseWaybillEntity.class);
+		//获取当前登录人仓库
+		List<BasicdataWarehouseEntity> myWatchWarehouse = basicdataWarehouseClient.getMyWatchWarehouse();
+		List<Long> collect = myWatchWarehouse.stream()
+			.map(BasicdataWarehouseEntity::getId)
+			.collect(Collectors.toList());
+//		queryWrapper.lambda()
+//			.in(collect.size() > 0, WarehouseWaybillEntity::getDepartureWarehouseId, collect)
+//			.or()
+//			.in(collect.size() > 0, WarehouseWaybillEntity::getDestinationWarehouseId, collect);
+		if(!collect.isEmpty()){
+			warehouseWaybillDTO.setDepartureWarehouseIds(collect);
+			warehouseWaybillDTO.setDestinationWarehouseIds(collect);
+		}
+		return baseMapper.pageInfo(page,warehouseWaybillDTO);
+	}
 }