修改订单查询

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionParcelListEntity.java

@@ -18,6 +18,7 @@ package com.logpm.distribution.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -122,6 +123,7 @@ public class DistributionParcelListEntity extends TenantEntity {
 	 * 入库时间
 	 */
 	@ApiModelProperty(value = "入库时间")
+	@JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
 	private Date warehouseEntryTimeEnd;
 	/**
 	 * 运单号

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

@@ -36,6 +36,7 @@ public class DistributionStockupVO extends DistributionStockupEntity {
 	private String headline;
 
 	private String groupName;
+	private String warehouseName; //仓库名称
 	//备货人
 	private String stockupUser;
 	private String stockupStatusName;

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

@@ -85,14 +85,7 @@ public class DistributionParcelListController extends BladeController  {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入distributionParcelList")
 	public R<IPage<DistributionParcelListVO>> list(@ApiIgnore @RequestParam Map<String, Object> distributionParcelList, Query query) {
-		Object o = distributionParcelList.get("stockArticleId");
-		distributionParcelList.remove("stockArticleId");
-		QueryWrapper<DistributionParcelListEntity> queryWrapper = Condition.getQueryWrapper(distributionParcelList, DistributionParcelListEntity.class);
-		if(Func.isNotEmpty(o)){
-			queryWrapper.in("stock_article_id",String.valueOf(o).split(","));
-		}
-
-		IPage<DistributionParcelListEntity> pages = distributionParcelListService.page(Condition.getPage(query),queryWrapper );
+		IPage<DistributionParcelListEntity> pages = distributionParcelListService.pageOweList(Condition.getPage(query),distributionParcelList );
 		return R.data(DistributionParcelListWrapper.build().pageVO(pages));
 	}
 

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

@@ -101,57 +101,8 @@ 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 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");
-		Object reservation = distributionStockArticle.get("reservation");
-		distributionStockArticle.remove("id");
-		distributionStockArticle.remove("startDate");
-		distributionStockArticle.remove("reservation");
-		distributionStockArticle.remove("entDate");
-		distributionStockArticle.remove("orderIds");
-		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(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)){
-			String  ids = d.toString();
-			queryWrapper.in("id",CommonUtil.stringNum(ids));
-		}
-		if(ObjectUtil.isNotEmpty(o2)){
-			queryWrapper.between("warehouse_entry_time",o2,o1);
-		}
-
-		queryWrapper.in("order_status",list);
-		List<BasicdataWarehouseEntity> myWarehouseList = warehouseClient.getMyWatchWarehouse();
-		List<Long> collect = myWarehouseList.stream().map(BasicdataWarehouseEntity::getId).collect(Collectors.toList());
-	//	if(ObjectUtil.isNotEmpty(collect)){
-			queryWrapper.in(collect.size()>0,"warehouse_id",collect);
-		//}
-		IPage<DistributionStockArticleEntity> pages = distributionStockArticleService.page(Condition.getPage(query), queryWrapper);
+		IPage<DistributionStockArticleEntity> pages = distributionStockArticleService.pageListOwe(Condition.getPage(query), distributionStockArticle);
 		return R.data(DistributionStockArticleWrapper.build().pageVO(pages));
 	}
 	/**
@@ -225,7 +176,7 @@ public class DistributionStockArticleController extends BladeController {
 			queryWrapper.between("warehouse_entry_time",o2,o1);
 		}
 		if(Func.isNotEmpty(orderIds)){
-			queryWrapper.notIn("id",Func.toLongList(orderIds));
+			queryWrapper.notIn(Func.isNotEmpty(orderIds),"id",Func.toLongList(orderIds));
 		}
 //		if(Func.isNotEmpty(orderIds)){
 //			queryWrapper.notIn("id",Func.toLongList(orderIds));

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

@@ -273,6 +273,7 @@ public class DistributionStockupController extends BladeController {
 	public R<IPage<DistrilbutionBillLadingVO>> billStockList(@ApiIgnore @RequestParam Map<String, Object> distributionStockup, Query query) {
 		distributionStockup.put("stockupType",3);
 		IPage<DistrilbutionBillLadingVO> page=distrilbutionBillLadingService.billStockList(Condition.getPage(query),distributionStockup);
+
 		return R.data(page);
 	}
 

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

@@ -16,7 +16,9 @@
  */
 package com.logpm.distribution.dto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.logpm.distribution.entity.DistributionParcelListEntity;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -40,4 +42,23 @@ public class DistributionParcelListDTO extends DistributionParcelListEntity {
 	private String sku;
 	private List<String> ids;
 
+	/**
+	 * 在库订单ID
+	 */
+	@ApiModelProperty(value = "在库订单ID")
+	@TableField(exist = false)
+	private String stockArticleIds;
+	/**
+	 * 在库订单ID
+	 */
+	@ApiModelProperty(value = "在库订单ID")
+	@TableField(exist = false)
+	private List<String> stockArticleIdsList;
+	/**
+	 * 在库订单ID
+	 */
+	@ApiModelProperty(value = "在库订单ID")
+	@TableField(exist = false)
+	private String stockArticleIdsLike;
+
 }

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

@@ -0,0 +1,32 @@
+package com.logpm.distribution.dto;
+
+import com.logpm.distribution.entity.DistributionStockArticleEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+/**
+ * @program: LogisticsPlatform-Service
+ * @description:
+ * @author: cyz
+ * @create: 2023-09-06 20:57
+ **/
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class DistributionStockArticleOweDTO extends DistributionStockArticleEntity {
+	private static final long serialVersionUID = 1L;
+	private String orderCodeNum; //订单号
+	private List<String> orderCodeNumList;
+	private String orderCodeNumLike;
+	private String waybillNum; //订单号
+	private List<String> waybillNumList;
+	private String waybillNumLike;
+	private String ids;
+	private List<String> idsList;
+	private String idsLike;
+	private String reservation;
+	private String startDate;
+	private String entDate;
+	private List<Long> warehouseIdList;
+}

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

@@ -16,6 +16,7 @@
  */
 package com.logpm.distribution.mapper;
 
+import com.logpm.distribution.dto.DistributionParcelListDTO;
 import com.logpm.distribution.entity.DistributionParcelListEntity;
 import com.logpm.distribution.vo.DistributionParcelListBaseVO;
 import com.logpm.distribution.vo.DistributionParcelListVO;
@@ -89,4 +90,6 @@ public interface DistributionParcelListMapper extends BaseMapper<DistributionPar
     List<PackageStockupVO> selectOrderInfoSelfList(@Param("reservationId") Long reservationId,@Param("stockupId") Long stockupId, @Param("stockArticleId")Long stockArticleId);
 
     List<DistributionParcelListEntity> findALLNoUpShelfPackageByOrderCode(@Param("orderCode") String orderCode);
+
+    IPage<DistributionParcelListEntity> pageOweList(IPage<Object> page,@Param("param") DistributionParcelListDTO parcelListEntity);
 }

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

@@ -148,7 +148,17 @@
 
     <select id="getParcelListOwnSelf" resultType="com.logpm.distribution.vo.DistributionParcelListVO">
         select ldpl.id id,ldpl.order_package_code orderPackageCode,ldpl.firsts,ldpl.second,ldpl.third_product thirdProduct,ldpl.material_name materialName,
-        ldpl.goods_allocation goodsAllocation,ldpl.pallet,lds.coding stockupStatus,lds.create_time stockupDate ,lds.stockup_area stockupArea
+        (
+        select GROUP_CONCAT(DISTINCT position_code)
+        from  logpm_warehouse_updown_goods
+        WHERE ldpl.id = association_id
+        ) AS goodsAllocation,
+        (
+        select GROUP_CONCAT(tray_code)
+        from  logpm_warehouse_tray_goods
+        where ldpl.id = association_id
+        ) AS pallet,
+               lds.coding stockupStatus,lds.create_time stockupDate ,lds.stockup_area stockupArea
         from  logpm_distribution_stockup_info ldsi
         LEFT JOIN logpm_distrilbution_bill_stock ldbs on ldsi.reservation_id = ldbs.bill_lading_id
         LEFT JOIN logpm_distribution_parcel_list ldpl on ldbs.stock_article_id =ldpl.stock_article_id
@@ -305,5 +315,62 @@
         and lwtg.id is null
         and lwug.id is null
     </select>
+    <select id="pageOweList" resultType="com.logpm.distribution.entity.DistributionParcelListEntity">
+        select DISTINCT ldpl.id,
+                        ldpl.tenant_id,
+                        ldpl.create_user,
+                        ldpl.create_time,
+                        ldpl.update_user,
+                        ldpl.update_time,
+                        ldpl.status, ldpl.is_deleted, ldpl.create_dept,
+                        ldpl.reserve1, ldpl.reserve2, ldpl.reserve3, ldpl.reserve4, ldpl.reserve5,
+                        ldpl.warehouse_id, ldpl.warehouse, ldpl.conditions, ldpl.order_package_code,
+                        ldpl.cargo_title, ldpl.shelf_title,
+                        ldpl.firsts, ldpl.second, ldpl.third_product, ldpl.quantity,
+                        ldpl.train_number, ldpl.stock_article_id, ldpl.order_code, ldpl.service_number,
+                        ldpl.material_id, ldpl.material_name, ldpl.material_code, ldpl.material_unit, ldpl.brand_id,
+                        ldpl.brand_name, ldpl.order_package_status, ldpl.order_package_freeze_status,
+                        ldpl.order_package_grounding_status, ldpl.order_package_stockup_status,
+                        ldpl.order_package_reservation_status, ldpl.order_package_loading_status,
+                        ldpl.waybill_number, ldpl.waybill_id, ldpl.warehouse_entry_time_end,
+                        ldpl.dealer_name, ldpl.dealer_code, ldpl.send_warehouse_id,
+                        ldpl.send_warehouse_name, ldpl.accept_warehouse_id, ldpl.accept_warehouse_name, ldpl.order_package_delivery_status ,
+                        GROUP_CONCAT(DISTINCT lwtg.tray_code) pallet,
+                        GROUP_CONCAT(DISTINCT lwug.position_code) goodsAllocation
+        From logpm_distribution_parcel_list ldpl
+                 LEFT JOIN logpm_warehouse_tray_goods lwtg on lwtg.association_id = ldpl.id
+                 LEFT JOIN logpm_warehouse_updown_goods lwug on lwug.association_id = ldpl.id
+        <where>
+            <if test="param.serviceNumber != null and param.serviceNumber != ''" >and ldpl.service_number like concat('%',#{param.serviceNumber},'%') </if>
+            <if test="param.waybillNumber != null and param.waybillNumber != ''" >and ldpl.waybill_number like concat('%',#{param.waybillNumber},'%') </if>
+            <if test="param.orderCode != null and param.orderCode != ''" >and ldpl.order_code like concat('%',#{param.orderCode},'%') </if>
+            <if test="param.warehouse != null and param.warehouse != ''" >and ldpl.warehouse like concat('%',#{param.warehouse},'%') </if>
+            <if test="param.orderPackageReservationStatus != null and param.orderPackageReservationStatus != ''" >and ldpl.order_package_reservation_status = #{param.orderPackageReservationStatus}</if>
+            <if test="param.orderPackageFreezeStatus != null and param.orderPackageFreezeStatus != ''" >and ldpl.order_package_freeze_status = #{param.orderPackageFreezeStatus}</if>
+            <if test="param.orderPackageStatus != null and param.orderPackageStatus != ''" >and ldpl.order_package_status = #{param.orderPackageStatus}</if>
+            <if test="param.orderPackageGroundingStatus != null and param.orderPackageGroundingStatus != ''" >and ldpl.order_package_grounding_status = #{param.orderPackageGroundingStatus}</if>
+            <if test="param.orderPackageStockupStatus != null and param.orderPackageStockupStatus != ''" >and ldpl.order_package_stockup_status = #{param.orderPackageStockupStatus}</if>
+            <if test="param.orderPackageReservationStatus != null and param.orderPackageReservationStatus != ''" >and ldpl.order_package_reservation_status = #{param.orderPackageReservationStatus}</if>
+            <if test="param.orderPackageCode != null and param.orderPackageCode != ''" >and ldpl.order_package_code like concat('%',#{param.orderPackageCode},'%') </if>
+            <if test="param.pallet != null and param.pallet != ''" >and lwtg.tray_code like concat('%',#{param.pallet},'%') </if>
+            <if test="param.goodsAllocation != null and param.goodsAllocation != ''" >and lwug.position_code like concat('%',#{param.goodsAllocation},'%') </if>
+            <if test="param.firsts != null and param.firsts != ''" >and ldpl.firsts like concat('%',#{param.firsts},'%') </if>
+            <if test="param.second != null and param.second != ''" >and ldpl.second like concat('%',#{param.second},'%') </if>
+            <if test="param.thirdProduct != null and param.thirdProduct != ''" >and ldpl.third_product like concat('%',#{param.thirdProduct},'%') </if>
+            <if test="param.materialName != null and param.materialName != ''" >and ldpl.material_name like concat('%',#{param.materialName},'%') </if>
+            <if test="param.warehouseEntryTimeEnd != null" >and DATE(ldpl.warehouse_entry_time_end) = #{param.warehouseEntryTimeEnd}</if>
+            <if test="param.trainNumber != null and param.trainNumber != ''" >and ldpl.train_number = #{param.trainNumber}</if>
+            <if test="param.sendWarehouseName != null and param.sendWarehouseName != ''" >and ldpl.send_warehouse_name like concat('%',#{param.sendWarehouseName},'%') </if>
+            <if test="param.stockArticleIdsList != null " >and ldpl.stock_article_id in
+             <foreach collection="param.stockArticleIdsList" separator="," close=")" item="a" open="(">
+                 #{a}
+             </foreach>
+             </if>
+            <if test="param.stockArticleIdsLike != null and param.stockArticleIdsLike != ''" >and ldpl.stock_article_id = #{param.stockArticleIdsLike} </if>
+
+
+        </where>
+        GROUP BY ldpl.id
+    </select>
 
 </mapper>

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

@@ -19,6 +19,8 @@ package com.logpm.distribution.mapper;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.distribution.dto.DistributionStockArticleDTO;
+import com.logpm.distribution.dto.DistributionStockArticleOweDTO;
 import com.logpm.distribution.entity.DistributionStockArticleEntity;
 import com.logpm.distribution.excel.DistributionStockArticleExcel;
 import com.logpm.distribution.vo.DistributionStockArticleQRCodeVO;
@@ -88,4 +90,5 @@ public interface DistributionStockArticleMapper extends BaseMapper<DistributionS
 
     List<Map> fingListByServiceNumber(@Param("serviceNumber") String serviceNumber);
 
+    IPage<DistributionStockArticleEntity> pageListOwe(IPage page,@Param("param")DistributionStockArticleOweDTO stockArticleEntity);
 }

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

@@ -307,6 +307,91 @@
           and ldsa.genre == 1
         and ldsa.service_number = #{serviceNumber}
     </select>
+    <select id="pageListOwe" parameterType="com.logpm.distribution.dto.DistributionStockArticleOweDTO" resultType="com.logpm.distribution.entity.DistributionStockArticleEntity">
+        select DISTINCT ldsa.id, ldsa.tenant_id,
+        ldsa.create_user,
+        ldsa.create_time,
+        ldsa.update_user,
+        ldsa.update_time,
+        ldsa.status, ldsa.is_deleted, ldsa.create_dept,
+        ldsa.reserve1, ldsa.reserve2, ldsa.reserve3, ldsa.reserve4, ldsa.reserve5,
+               ldsa.service_number, ldsa.order_code,
+               ldsa.mall_id, ldsa.mall_code, ldsa.mall_name, ldsa.store_name,
+               ldsa.store_code, ldsa.store_id, ldsa.description_goods, ldsa.warehouse_id,
+               ldsa.warehouse, ldsa.warehouse_entry_time, ldsa.store_time, ldsa.total_number, ldsa.hand_quantity,
+               ldsa.complete_set, ldsa.brand, ldsa.type_service, ldsa.customer_name, ldsa.customer_telephone, ldsa.customer_address, ldsa.genre,
+               ldsa.stockup_status, ldsa.reservation_status, ldsa.order_status, ldsa.grounding_status, ldsa.order_receive_status,
+               ldsa.freeze_status, ldsa.notification, ldsa.fee, ldsa.rate, ldsa.advance_id, ldsa.waybill_id, ldsa.waybill_number,
+               ldsa.consignee_unit, ldsa.collect_fee, ldsa.storage_fee, ldsa.consignee_person, ldsa.consignee_address,
+               ldsa.consignee_mobile, ldsa.warehouse_entry_time_end,
+               ldsa.sorting_quantity, ldsa.delivery_quantity, ldsa.transfer_quantity,
+               ldsa.signin_quantity, ldsa.resource,  ldsa.is_opai,
+               ldsa.inventory_date, ldsa.inventory_person, ldsa.inventory_person_id,
+               ldsa.available_quantity, ldsa.is_have_data, ldsa.stock_article_code, ldsa.dealer_name, ldsa.dealer_code,
+               ldsa.train_number, ldsa.factory_train, ldsa.sending, ldsa.send_warehouse_id, ldsa.send_warehouse_name,
+               ldsa.is_zero, ldsa.accept_warehouse_id, ldsa.accept_warehouse_name, ldsa.order_delivery_status,GROUP_CONCAT(DISTINCT lwtg.tray_code) trays,
+        GROUP_CONCAT(DISTINCT lwug.position_code) allocation
+        from logpm_distribution_stock_article ldsa
+        LEFT JOIN logpm_distribution_parcel_list ldpl on ldsa.id = ldpl.stock_article_id
+        LEFT JOIN logpm_warehouse_tray_goods lwtg on lwtg.association_id = ldpl.id
+        LEFT JOIN logpm_warehouse_updown_goods  lwug on lwug.association_id = ldpl.id
+        <where>
+            ldsa.is_deleted = 0 and ldsa.order_status in (10,20,30,40,50,60,70)
+            <if test="param.orderCodeNumList != null">
+                and ldsa.order_code in
+                <foreach collection="param.orderCodeNumList" separator="," close=")" item="a" open="(">
+                    #{a}
+                </foreach>
+             </if>
+            <if test=" param.orderCodeNumLike != '' and param.orderCodeNumLike != null  ">and  ldsa.order_code like concat('%',#{param.orderCodeNumLike},'%')</if>
+            <if test=" param.waybillNumList != null  ">
+            and ldsa.waybill_number in
+                <foreach collection="param.waybillNumList" open="(" item="a" close=")" separator=",">
+                    #{a}
+                </foreach>
+              </if>
+            <if test=" param.waybillNumLike != '' and param.waybillNumLike != null  ">and ldsa.waybill_number like concat('%',#{param.waybillNumLike},'%')   </if>
+            <if test=" param.warehouseIdList != null  ">and ldsa.warehouse_id in
+                <foreach collection="param.warehouseIdList" open="(" item="a" close=")" separator=",">
+                    #{a}
+                </foreach>
+            </if>
+            <if test=" param.warehouseId != '' and param.warehouseId != null  ">and ldsa.warehouse_id = #{param.warehouseId}   </if>
+            <if test="   param.idsList != null  ">and ldsa.id in
+                <foreach collection="param.idsList" open="(" item="a" close=")" separator=",">
+                    #{a}
+                </foreach>
+            </if>
+            <if test=" param.idsLike != '' and param.idsLike != null  ">and ldsa.id = #{param.idsLike}</if>
+            <if test=" param.reservationStatus != '' and param.reservationStatus != null  ">and ldsa.reservation_status = #{param.reservationStatus}  </if>
+            <if test="  param.startDate != null  ">and ldsa.warehouse_entry_time between #{param.startDate} and #{param.entDate}   </if>
+            <if test="  param.warehouseEntryTime != null  ">and  DATE(ldsa.warehouse_entry_time) = #{param.warehouseEntryTime}   </if>
+            <if test="  param.inventoryDate != null  ">and  DATE(ldsa.inventory_date) = #{param.inventoryDate}   </if>
+            <if test="  param.serviceNumber != null and param.serviceNumber != ''  ">and ldsa.service_number like concat('%',#{param.serviceNumber},'%')  </if>
+            <if test="  param.orderCode != null  and param.orderCode != '' ">and ldsa.order_code like concat('%',#{param.orderCode},'%')  </if>
+            <if test="  param.waybillNumber != null  and param.waybillNumber != ''  ">and ldsa.waybill_number like concat('%',#{param.waybillNumber},'%')  </if>
+            <if test="  param.mallName != null  and param.mallName != '' ">and ldsa.mall_name like concat('%',#{param.mallName},'%')  </if>
+            <if test="  param.descriptionGoods != null  and param.descriptionGoods != ''  ">and ldsa.description_goods like concat('%',#{param.descriptionGoods},'%')  </if>
+            <if test="  param.warehouse != null  and param.warehouse != ''  ">and ldsa.warehouse like concat('%',#{param.warehouse},'%')  </if>
+            <if test="  param.consigneePerson != null  and param.consigneePerson != ''  ">and ldsa.consignee_person like concat('%',#{param.consigneePerson},'%')  </if>
+            <if test="  param.availableQuantity != null  ">and ldsa.available_quantity like concat('%',#{param.availableQuantity},'%')  </if>
+            <if test="  param.groundingStatus != null  ">and ldsa.grounding_status = #{param.groundingStatus}  </if>
+            <if test="  param.genre != null  ">and ldsa.genre = #{param.genre} </if>
+            <if test="  param.freezeStatus != null  ">and ldsa.freeze_status = #{param.freezeStatus}  </if>
+            <if test="  param.orderStatus != null  ">and ldsa.order_status  = #{param.orderStatus}  </if>
+            <if test="  param.reservationStatus != null  ">and ldsa.reservation_status = #{param.reservationStatus}  </if>
+            <if test="  param.stockupStatus != null  ">and ldsa.stockup_status = #{param.stockupStatus}  </if>
+            <if test="  param.orderReceiveStatus != null  ">and ldsa.order_receive_status = #{param.orderReceiveStatus}  </if>
+            <if test="  param.completeSet != null  ">and ldsa.complete_set like concat('%',#{param.completeSet},'%')  </if>
+            <if test="  param.typeService != null  ">and ldsa.type_service like concat('%',#{param.typeService},'%')  </if>
+            <if test="  param.customerName != null  and param.customerName != ''  ">and ldsa.customer_name like concat('%',#{param.customerName},'%')  </if>
+            <if test="  param.customerTelephone != null  and param.customerTelephone != ''  ">and ldsa.customer_telephone like concat('%',#{param.customerTelephone},'%')  </if>
+            <if test="  param.customerAddress != null   and param.customerAddress != '' ">and ldsa.customer_address like concat('%',#{param.customerAddress},'%')  </if>
+            <if test="  param.trays != null   and param.trays != '' ">and lwtg.tray_code like concat('%',#{param.trays},'%')  </if>
+            <if test="  param.allocation != null   and param.allocation != '' ">and lwug.position_code like concat('%',#{param.allocation},'%')  </if>
+        </where>
+        GROUP BY  ldsa.id ,ldpl.id
+    </select>
 
 
 </mapper>

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

@@ -160,4 +160,12 @@ public interface DistributionStockupMapper extends BaseMapper<DistributionStocku
 	 * @return
 	 */
 	List<DistributionStockupVO> getMarketDeliveryStockupInfo(@Param("deliveryListId")Long id);
+
+	/**
+	 *
+	 * @param page
+	 * @param distributionStockupEntity
+	 * @return
+	 */
+	IPage<DistributionStockupEntity> pageOweList(IPage<Object> page,@Param("param")DistributionStockupEntity distributionStockupEntity);
 }

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

@@ -54,13 +54,16 @@
         select * from logpm_distribution_stockup where is_deleted = 0
     </select>
     <select id="pageList" resultType="com.logpm.distribution.vo.DistributionStockupVO">
-        select lds.id,lds.stockup_date stockupDate, lds.stockup_user stockupUser, lds.stockup_status stockupStatus, lds.stockup_area stockupArea,
-               lds.assign_status assignStatus, lds.stockip_allocation stockipAllocation, lds.goods_area_id goodsAreaId, lds.forklift_name forkliftName,
+        select DISTINCT lds.id,lds.stockup_date stockupDate, lds.stockup_user stockupUser, lds.stockup_status stockupStatus, lds.stockup_area stockupArea,
+               lds.assign_status assignStatus, lds.goods_area_id goodsAreaId, lds.forklift_name forkliftName,
                lds.loader_name loaderName, lds.forklift_id forkliftId,lds.loader_id loaderId,lds.fix_time fixTime,lds.assign_time assignTime,
-               lwga.headline,btg.group_name groupName,lds.type_service typeService,lds.outbound_date outboundDate,lds.stockup_code stockupCode
+               btg.group_name groupName,lds.type_service typeService,lds.outbound_date outboundDate,lds.stockup_code stockupCode,
+        (GROUP_CONCAT(lwug.position_code)) stockipAllocation
         from logpm_distribution_stockup lds
-                 LEFT JOIN logpm_warehouse_goods_area lwga ON lds.stockup_area = lwga.id
-                 LEFT JOIN logpm_basicdata_team_group btg ON lds.loader_id = btg.id
+        LEFT JOIN logpm_distribution_stockup_info ldsi on ldsi.stockup_id =lds.id
+        LEFT JOIN logpm_distribution_reservation_package ldrp on ldrp.reservation_id = ldsi.reservation_id
+        LEFT JOIN logpm_warehouse_updown_goods lwug on lwug.association_id = ldrp.parce_list_id
+        LEFT JOIN logpm_basicdata_team_group btg ON lds.loader_id = btg.id
         <where>
            lds.is_deleted = 0
            <!-- lds.tenant_id = #{param.tenantId} -->
@@ -76,8 +79,41 @@
             <if test="param.assignStatus != null and param.assignStatus != '' "> and lds.assign_status = #{param.assignStatus}</if>
             <if test="param.forkliftName != null and param.forkliftName != '' "> and lds.forklift_name like concat('%', #{param.forkliftName},'%')</if>
             <if test="param.loaderName != null and param.loaderName != '' "> and lds.loader_name like concat('%', #{param.loaderName},'%')</if>
+            <if test="param.groupName != null and param.groupName != '' "> and btg.group_name like concat('%', #{param.groupName},'%')</if>
             <if test="param.typeService != null and param.typeService != '' "> and lds.type_service = #{param.typeService}</if>
         </where>
+        GROUP BY lds.id
+    </select>
+    <select id="pageOweList"  resultType="com.logpm.distribution.vo.DistributionStockupVO">
+        select DISTINCT lds.id,lds.stockup_date stockupDate, lds.stockup_user stockupUser, lds.stockup_status stockupStatus, lds.stockup_area stockupArea,
+        lds.assign_status assignStatus, lds.goods_area_id goodsAreaId, lds.forklift_name forkliftName,
+        lds.loader_name loaderName, lds.forklift_id forkliftId,lds.loader_id loaderId,lds.fix_time fixTime,lds.assign_time assignTime,
+        btg.group_name groupName,lds.type_service typeService,lds.outbound_date outboundDate,lds.stockup_code stockupCode,(GROUP_CONCAT(lwtg.tray_code)) stockipAllocation
+        from logpm_distribution_stockup lds
+        LEFT JOIN logpm_distribution_stockup_info ldsi on ldsi.stockup_id = lds.id
+        LEFT JOIN logpm_distrilbution_bill_stock ldbs on ldbs.bill_lading_id = ldsi.reservation_id
+        LEFT JOIN logpm_distribution_parcel_list ldpl on ldpl.stock_article_id = ldbs.stock_article_id
+        LEFT JOIN logpm_warehouse_tray_goods lwtg on lwtg.association_id = ldpl.id
+        LEFT JOIN logpm_basicdata_team_group btg ON lds.loader_id = btg.id
+        <where>
+            lds.is_deleted = 0
+            <!-- lds.tenant_id = #{param.tenantId} -->
+            <if test="param.typeService != null and param.typeService != '' "> and lds.type_service = #{param.typeService}</if>
+            <if test="param.stockupDate != null  "> and  TO_DAYS(lds.stockup_date)=TO_DAYS( #{param.stockupDate})</if>
+            <if test="param.outboundDate != null  "> and  TO_DAYS(lds.outbound_date)=TO_DAYS( #{param.outboundDate})</if>
+            <if test="param.startDate != null  "> and  lds.stockup_date between #{param.startDate} and #{param.entDate}</if>
+            <if test="param.stockupUser != null and param.stockupUser != '' "> and lds.stockup_user like concat('%',#{param.stockupUser},'%')</if>
+            <if test="param.stockipAllocation != null and param.stockipAllocation != '' "> and lds.stockip_allocation like concat('%',#{param.stockipAllocation},'%')</if>
+            <if test="param.stockupCode != null and param.stockupCode != '' "> and lds.stockup_code like concat('%',#{param.stockupCode},'%')  </if>
+            <if test="param.stockupStatus != null and param.stockupStatus != '' "> and lds.stockup_status = #{param.stockupStatus}</if>
+            <if test="param.stockupArea != null and param.stockupArea != '' "> and lds.stockup_area = #{param.stockupArea}</if>
+            <if test="param.assignStatus != null and param.assignStatus != '' "> and lds.assign_status = #{param.assignStatus}</if>
+            <if test="param.forkliftName != null and param.forkliftName != '' "> and lds.forklift_name like concat('%', #{param.forkliftName},'%')</if>
+            <if test="param.loaderName != null and param.loaderName != '' "> and lds.loader_name like concat('%', #{param.loaderName},'%')</if>
+            <if test="param.typeService != null and param.typeService != '' "> and lds.type_service = #{param.typeService}</if>
+            <if test="param.groupName != null and param.groupName != '' "> and btg.group_name like concat('%', #{param.groupName},'%')</if>
+        </where>
+        GROUP BY   lds.id
     </select>
 
 
@@ -569,11 +605,12 @@
         lds.stockup_date AS stockupDate,
         lds.stockup_area AS stockupArea,
         ldsa.id stockArticleId,
-        (
-        SELECT GROUP_CONCAT(NULLIF(dpl.goods_allocation, '') SEPARATOR ', ')
-        FROM logpm_distribution_parcel_list dpl
+        (select GROUP_CONCAT(DISTINCT lwug.position_code)
+        from logpm_distribution_parcel_list dpl
+        LEFT JOIN logpm_warehouse_updown_goods lwug on dpl.id = lwug.association_id
         WHERE dpl.stock_article_id = ldbs.stock_article_id
-        ) AS goodsAllocation,(
+        ) AS goodsAllocation,
+        (
         SELECT COUNT(*)
         FROM logpm_distribution_parcel_list dpl
         WHERE dpl.stock_article_id = ldbs.stock_article_id

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

@@ -17,6 +17,7 @@
 package com.logpm.distribution.service;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.logpm.distribution.entity.DistributionParcelListEntity;
 import com.logpm.distribution.vo.DistributionParcelListBaseVO;
 import com.logpm.distribution.vo.DistributionParcelListVO;
@@ -99,4 +100,6 @@ public interface IDistributionParcelListService extends BaseService<Distribution
 	List<PackageStockupVO> selectOrderInfoSelfList(Long reservationId, Long stockArticleId, Long stockupId, Long trayId);
 
     List<DistributionParcelListEntity> findALLNoUpShelfPackageByOrderCode(String orderCode);
+
+    IPage<DistributionParcelListEntity> pageOweList(IPage<Object> page,Map<String, Object> distributionParcelList);
 }

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

@@ -17,6 +17,7 @@
 package com.logpm.distribution.service;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.logpm.distribution.dto.DistributionStockArticleDTO;
 import com.logpm.distribution.entity.DistributionStockArticleEntity;
@@ -118,4 +119,6 @@ public interface IDistributionStockArticleService extends BaseService<Distributi
     List<DistributionStockArticleEntity> findListByWaybillNumber(String waybillNumber);
 
     IPage<DistributionStockArticleEntity> pageWhole(IPage<DistributionStockArticleEntity> page,Map<String, Object> distributionStockArticle);
+
+    IPage<DistributionStockArticleEntity> pageListOwe(IPage<Object> page,Map<String, Object> distributionStockArticle);
 }

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

@@ -24,6 +24,7 @@ import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
 import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
+import com.logpm.distribution.dto.DistributionParcelListDTO;
 import com.logpm.distribution.entity.DistributionParcelListEntity;
 import com.logpm.distribution.excel.DistributionParcelListExcel;
 import com.logpm.distribution.mapper.DistributionParcelListMapper;
@@ -34,7 +35,9 @@ import com.logpm.distribution.vo.PackageStockupVO;
 import lombok.AllArgsConstructor;
 import org.springblade.common.constant.DictBizConstant;
 import org.springblade.common.constant.order.OrderStockupStatusConstant;
+import org.springblade.common.utils.CommonUtil;
 import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.core.tool.utils.Func;
 import org.springblade.system.cache.DictBizCache;
 import org.springframework.stereotype.Service;
 
@@ -189,6 +192,21 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 		return baseMapper.findALLNoUpShelfPackageByOrderCode(orderCode);
 	}
 
+	@Override
+	public IPage<DistributionParcelListEntity> pageOweList(IPage<Object> page, Map<String, Object> distributionParcelList) {
+		DistributionParcelListDTO distributionParcelListDTO = JSONObject.parseObject(JSONObject.toJSONString(distributionParcelList), DistributionParcelListDTO.class);
+		if(Func.isNotEmpty(distributionParcelListDTO.getStockArticleIds())){
+			String trim = distributionParcelListDTO.getStockArticleIds().trim();
+			List<String> list = CommonUtil.stringNum(trim);
+			if(list.size() > 0){
+				distributionParcelListDTO.setStockArticleIdsList(list);
+			}else{
+				distributionParcelListDTO.setStockArticleIdsLike(trim);
+			}
+		}
+		return baseMapper.pageOweList(page,distributionParcelListDTO);
+	}
+
 	/**
 	 *
 	 * @param distributionParcelList

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

@@ -31,6 +31,7 @@ import com.logpm.basic.feign.IBasicPrintTemplateClient;
 import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
 import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
 import com.logpm.distribution.dto.DistributionStockArticleDTO;
+import com.logpm.distribution.dto.DistributionStockArticleOweDTO;
 import com.logpm.distribution.entity.*;
 import com.logpm.distribution.excel.DistributionStockArticleExcel;
 import com.logpm.distribution.mapper.DistributionAddvalueMapper;
@@ -627,4 +628,56 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 	//	}
 		return this.page(page, queryWrapper);
 	}
+
+	/**
+	 * 自己 的列表查询
+	 * @param page
+	 * @param distributionStockArticle
+	 * @return
+	 */
+	@Override
+	public IPage<DistributionStockArticleEntity> pageListOwe(IPage<Object> page, Map<String, Object> distributionStockArticle) {
+		DistributionStockArticleOweDTO stockArticleEntity = JSONObject.parseObject(JSONObject.toJSONString(distributionStockArticle), DistributionStockArticleOweDTO.class);
+		if(Func.isNotEmpty(stockArticleEntity.getOrderCodeNum())){
+			String anumbering = stockArticleEntity.getOrderCodeNum().trim();
+			List<String> list = CommonUtil.stringNum(anumbering);
+			if(list.size() > 1){
+				stockArticleEntity.setOrderCodeNumList(list);
+			}else{
+				stockArticleEntity.setOrderCodeNumLike(anumbering);
+			}
+		}
+		if(Func.isNotEmpty(stockArticleEntity.getWaybillNum())){
+			String waybill = stockArticleEntity.getWaybillNum().trim();
+			List<String> list = CommonUtil.stringNum(waybill);
+			if(list.size() > 1){
+				stockArticleEntity.setWaybillNumList(list);
+			}else{
+				stockArticleEntity.setWaybillNumLike(waybill);
+			}
+		}
+		if(ObjectUtil.isNotEmpty(stockArticleEntity.getIds())){
+			String  ids = stockArticleEntity.getIds().trim();
+			List<String> list = CommonUtil.stringNum(ids);
+			if(list.size() > 1){
+				stockArticleEntity.setIdsList(list);
+			}else{
+				stockArticleEntity.setIdsLike(ids);
+			}
+		}
+
+		if(Func.isNotEmpty(stockArticleEntity.getReservation())){
+			stockArticleEntity.setReservationStatus("10");
+		}
+		List<BasicdataWarehouseEntity> myWarehouseList = warehouseClient.getMyWatchWarehouse();
+		List<Long> collect = myWarehouseList.stream().map(BasicdataWarehouseEntity::getId).collect(Collectors.toList());
+		if(collect.size() > 1){
+			stockArticleEntity.setWarehouseIdList(collect);
+		}else{
+			stockArticleEntity.setWarehouseId(collect.get(0));
+		}
+		IPage<DistributionStockArticleEntity> distributionStockArticleEntityIPage = baseMapper.pageListOwe(page, stockArticleEntity);
+
+		return distributionStockArticleEntityIPage;
+	}
 }

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

@@ -219,7 +219,14 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 //		List<Long> collect = myWatchWarehouse.stream().map(BasicdataWarehouseEntity::getId).collect(Collectors.toList());
 
 		distributionStockupEntity.setTenantId(AuthUtil.getTenantId());
-		return baseMapper.pageList(page, distributionStockupEntity);
+		if(distributionStockupEntity.getTypeService().equals("3")){
+			return baseMapper.pageOweList(page, distributionStockupEntity);
+		}else{
+			return baseMapper.pageList(page, distributionStockupEntity);
+		}
+
+
+
 	}
 
 	@Override

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

@@ -1220,6 +1220,10 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 
 		List<DistrilbutionBillLadingVO> result =baseMapper.selectBillStockList(page,distrilbutionBillLading);
 		for (DistrilbutionBillLadingVO distrilbutionBillLadingVO : result) {
+			List<DistributionDeliveryChargeEntity> list = distributionDeliveryChargeService.list(Wrappers.<DistributionDeliveryChargeEntity>query().lambda()
+				.eq(DistributionDeliveryChargeEntity::getBillLading, distrilbutionBillLadingVO.getId())
+			);
+			distrilbutionBillLadingVO.setList(list);
 			distrilbutionBillLadingVO.setConditionName(DictBizCache.getValue(DictBizConstant.BILL_CONDITIONS_STATUS,distrilbutionBillLadingVO.getConditions()));
 			distrilbutionBillLadingVO.setNotificationStatusName(DictBizCache.getValue(DictBizConstant.BILL_NOTIFICATION_STATUS,distrilbutionBillLadingVO.getNotificationStatus()));
 			distrilbutionBillLadingVO.setCertificateTypeName(DictBizCache.getValue(DictBizConstant.CERTIFICATE_TYPE,distrilbutionBillLadingVO.getCertificateType()));

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

@@ -31,8 +31,8 @@ public class DistributionParcelListWrapper extends BaseEntityWrapper<Distributio
 
 	@Override
 	public DistributionParcelListVO entityVO(DistributionParcelListEntity entity) {
-		IWarehouseUpdownGoodsClient warehouseUpdownGoodsClient = SpringUtil.getBean(IWarehouseUpdownGoodsClient.class);
-		IWarehouseTrayGoodsClient warehouseTrayGoodsClient = SpringUtil.getBean(IWarehouseTrayGoodsClient.class);
+//		IWarehouseUpdownGoodsClient warehouseUpdownGoodsClient = SpringUtil.getBean(IWarehouseUpdownGoodsClient.class);
+//		IWarehouseTrayGoodsClient warehouseTrayGoodsClient = SpringUtil.getBean(IWarehouseTrayGoodsClient.class);
 
 		DistributionParcelListVO parcelListVO = Objects.requireNonNull(BeanUtil.copy(entity,DistributionParcelListVO.class));
 		parcelListVO.setOrderPackageStatusName(DictBizCache.getValue(DictBizConstant.ORDER_PACKAGE_STATUS, entity.getOrderPackageStatus()));
@@ -44,20 +44,20 @@ public class DistributionParcelListWrapper extends BaseEntityWrapper<Distributio
 		//如果有上架选择填充货位信息
 //		if (Func.isNotBlank(parcelListVO.getOrderPackageGroundingStatus())){
 //			if (parcelListVO.getOrderPackageGroundingStatus().equals("20")){
-				if (Func.isNotEmpty(warehouseUpdownGoodsClient)){
-					String s = warehouseUpdownGoodsClient.selectMsgBywrap(parcelListVO.getId());
-					if (Func.isNotEmpty(s)){
-						parcelListVO.setAllocationMsg(s);
-					}
-				}
+//				if (Func.isNotEmpty(warehouseUpdownGoodsClient)){
+//					String s = warehouseUpdownGoodsClient.selectMsgBywrap(parcelListVO.getId());
+//					if (Func.isNotEmpty(s)){
+//						parcelListVO.setAllocationMsg(s);
+//					}
+//				}
+//			}
+//		}
+//		if(Func.isNotEmpty(warehouseTrayGoodsClient)){
+//			String s = warehouseUpdownGoodsClient.selectMsgBywrap(parcelListVO.getId());
+//			if (Func.isNotEmpty(s)){
+//				parcelListVO.setTrayMsg(s);
 //			}
 //		}
-		if(Func.isNotEmpty(warehouseTrayGoodsClient)){
-			String s = warehouseUpdownGoodsClient.selectMsgBywrap(parcelListVO.getId());
-			if (Func.isNotEmpty(s)){
-				parcelListVO.setTrayMsg(s);
-			}
-		}
 
 //		parcelListVO.setOrderPackageReservationStatusName(DictBizCache.getValue(DictBizConstant.ORDER_PACKAGE_FREEZE_STATUS, entity.getOrderPackageReservationStatus()));
 		return parcelListVO;