修改查询条件

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

@@ -22,6 +22,7 @@ public class DictBizConstant {
 	public static final String ORDER_PACKAGE_FREEZE_STATUS = "order_package_freeze_status";//包间冻结状态
 	public static final String ORDER_PACKAGE_STOCKUP_STATUS = "order_package_stockup_status";//包间备货状态
 	public static final String ORDER_PACKAGE_GROUNDING_STATUS = "order_package_grounding_status";//包间上架状态
+	public static final String STOCK_ALLOCATION = "stock_allocation";//包间上架状态
 
 
 

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

@@ -164,6 +164,18 @@ public class DistributionStockupEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "备注")
 	private String remarks;
+	/**
+	 * 开始时间
+	 */
+	@ApiModelProperty(value = "开始时间")
+	@TableField(exist = false)
+	private String startDate;
+	/**
+	 * 结束时间
+	 */
+	@ApiModelProperty(value = "结束时间")
+	@TableField(exist = false)
+	private String entDate;
 	/**
 	 * 取消原因
 	 */

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

@@ -40,12 +40,15 @@ public class DistributionStockupVO extends DistributionStockupEntity {
 	private String stockupCode;
 	//备货人
 	private String stockupUser;
+	private String stockupStatusName;
 	//备货状态
 	private String stockupStatus;
+	private String assignStatusName;
 	//预约时间
 	private Date reservationDate;
 	//服务类型
 	private String serveType;
+	private String typeServiceName;
 	//配送方式
 	private String deliveryWay;
 	//配送类型

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

@@ -52,6 +52,9 @@ public class DistrilbutionBillLadingVO extends DistrilbutionBillLadingEntity {
 	private String transport; //搬运
 	private String forklift; //叉车
 
+	private String stockupStatusName;
+	private String assignStatusName;
+
 	private List<DistributionDeliveryChargeEntity> list;
 
 }

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

@@ -16,6 +16,7 @@
  */
 package com.logpm.distribution.controller;
 
+import com.logpm.distribution.wrapper.DistributionStockupWrapper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -121,10 +122,10 @@ public class DistributionStockupController extends BladeController {
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入distributionStockup")
-	public R<IPage<DistributionStockupEntity>> list(@ApiIgnore @RequestParam Map<String, Object> distributionStockup, Query query) {
+	public R<IPage<DistributionStockupVO>> list(@ApiIgnore @RequestParam Map<String, Object> distributionStockup, Query query) {
 
 		IPage<DistributionStockupEntity> pages = distributionStockupService.pageList(Condition.getPage(query),distributionStockup);
-		return R.data(pages);
+		return R.data(DistributionStockupWrapper.build().pageVO(pages));
 	}
 	/**
 	 * 备货信息表 分页

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

@@ -21,6 +21,7 @@ import com.logpm.distribution.entity.DistributionStockupEntity;
 import com.logpm.distribution.vo.DistributionStockupVO;
 import com.logpm.distribution.vo.DistrilbutionBillLadingDetailsVO;
 import com.logpm.distribution.vo.DistrilbutionBillLadingOwnVO;
+import com.logpm.distribution.wrapper.DistrilbutionBillLadingWrapper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -86,9 +87,15 @@ public class DistrilbutionBillLadingController extends BladeController {
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入distrilbutionBillLading")
-	public R<IPage<DistrilbutionBillLadingEntity>> list(@ApiIgnore @RequestParam Map<String, Object> distrilbutionBillLading, Query query) {
+	public R<IPage<DistrilbutionBillLadingVO>> list(@ApiIgnore @RequestParam Map<String, Object> distrilbutionBillLading, Query query) {
-		IPage<DistrilbutionBillLadingEntity> pages = distrilbutionBillLadingService.page(Condition.getPage(query), Condition.getQueryWrapper(distrilbutionBillLading, DistrilbutionBillLadingEntity.class));
+		Object o = distrilbutionBillLading.get("startDate");
-		return R.data(pages);
+		Object o1 = distrilbutionBillLading.get("entDate");
+		QueryWrapper<DistrilbutionBillLadingEntity> queryWrapper = Condition.getQueryWrapper(distrilbutionBillLading, DistrilbutionBillLadingEntity.class);
+		if(ObjectUtil.isNotEmpty(o) ||  ObjectUtil.isNotEmpty(o1)){
+			queryWrapper.between("stockup_date",o,o1);
+		}
+		IPage<DistrilbutionBillLadingEntity> pages = distrilbutionBillLadingService.page(Condition.getPage(query),queryWrapper );
+		return R.data(DistrilbutionBillLadingWrapper.build().pageVO(pages));
 	}
 
 

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

@@ -42,8 +42,10 @@
         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 , lds.stockup_user , lds.stockup_status , lds.stockup_area , lds.assign_status , lds.stockip_allocation , lds.goods_area_id , lds.forklift_name ,
+        select lds.id,lds.stockup_date stockupDate, lds.stockup_user stockupUser, lds.stockup_status stockupStatus, lds.stockup_area stockupArea,
-               lds.loader_name , lds.forklift_id ,lds.loader_id ,lds.fix_time ,lds.assign_time,lwga.headline,btg.group_name,lds.type_service
+               lds.assign_status assignStatus, lds.stockip_allocation stockipAllocation, 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
         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
@@ -52,6 +54,7 @@
            <!-- 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.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 = #{param.stockupUser}</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>

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

@@ -169,7 +169,7 @@
         select lad.id,lad.pick_up_time ,lad.consignee ,lad.pick_up_plate ,lad.delivery_document ,lad.certificate_type ,lad.total_cost
         from logpm_distrilbution_bill_lading lad
         <where>
-            ldbl.id = #{id}
+            lad.id = #{id}
         </where>
     </select>
 

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

@@ -19,6 +19,7 @@ package com.logpm.distribution.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.logpm.basicdata.feign.IBasicdataCodeClient;

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

@@ -18,8 +18,10 @@ package com.logpm.distribution.wrapper;
 
 import com.logpm.distribution.entity.DistributionStockupEntity;
 import com.logpm.distribution.vo.DistributionStockupVO;
+import org.springblade.common.constant.DictBizConstant;
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.system.cache.DictBizCache;
 
 import java.util.Objects;
 
@@ -40,7 +42,9 @@ public class DistributionStockupWrapper extends BaseEntityWrapper<DistributionSt
 		DistributionStockupVO distributionStockupVO = Objects.requireNonNull(BeanUtil.copy(distributionStockupEntity, DistributionStockupVO.class));
 //		String deliveryMethodStr = DictBizCache.getValue(DictBizConstant.DELIVERY_METHOD, distributionStockupVO.getDeliveryMethod());
 //		distributionStockupVO.setDeliveryMethodStr(deliveryMethodStr);
-
+		distributionStockupVO.setStockupStatusName(DictBizCache.getValue(DictBizConstant.STOCKUP_STATUS,distributionStockupEntity.getStockupStatus()));
+		distributionStockupVO.setAssignStatusName(DictBizCache.getValue(DictBizConstant.STOCK_ALLOCATION,distributionStockupEntity.getAssignStatus()));
+		distributionStockupVO.setTypeServiceName(DictBizCache.getValue(DictBizConstant.DISTRIBUTION_TYPE,distributionStockupEntity.getTypeService()));
 		return distributionStockupVO;
 	}
 

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

@@ -0,0 +1,34 @@
+package com.logpm.distribution.wrapper;
+
+import com.logpm.distribution.entity.DistrilbutionBillLadingEntity;
+import com.logpm.distribution.vo.DistrilbutionBillLadingVO;
+import org.springblade.common.constant.DictBizConstant;
+import org.springblade.core.mp.support.BaseEntityWrapper;
+import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.core.tool.utils.ObjectUtil;
+import org.springblade.system.cache.DictBizCache;
+import org.springframework.beans.BeanUtils;
+
+import java.util.Objects;
+
+/**
+ * @program: LogisticsPlatform-Service
+ * @description:
+ * @author: cyz
+ * @create: 2023-08-03 16:03
+ **/
+public class DistrilbutionBillLadingWrapper extends BaseEntityWrapper<DistrilbutionBillLadingEntity, DistrilbutionBillLadingVO> {
+
+	public static  DistrilbutionBillLadingWrapper build(){
+		return  new DistrilbutionBillLadingWrapper();
+	}
+
+	@Override
+	public DistrilbutionBillLadingVO entityVO(DistrilbutionBillLadingEntity entity) {
+		DistrilbutionBillLadingVO distrilbutionBillLadingVO = Objects.requireNonNull(BeanUtil.copy(entity, DistrilbutionBillLadingVO.class));
+		distrilbutionBillLadingVO.setTypeServiceName(DictBizCache.getValue(DictBizConstant.DISTRIBUTION_TYPE,entity.getStockupStatus()));
+		distrilbutionBillLadingVO.setAssignStatusName(DictBizCache.getValue(DictBizConstant.STOCK_ALLOCATION,entity.getAssignStatus()));
+		distrilbutionBillLadingVO.setStockupStatusName(DictBizCache.getValue(DictBizConstant.STOCKUP_STATUS,entity.getStockupStatus()));
+		return distrilbutionBillLadingVO;
+	}
+}