1.修改查看自提备货任务关联查询自提任务

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

@@ -25,7 +25,7 @@ public class DictBizConstant {
 	public static final String ORDER_PACKAGE_GROUNDING_STATUS = "order_package_grounding_status";//包件上架状态
 	public static final String ORDER_PACKAGE_RESERVATION_STATUS = "order_package_reservation_status";//包件预约状态
 	public static final String STOCK_ALLOCATION = "stock_assign_status";//包件上架状态
-	public static final String CERTIFICATE_TYPE = "certificate_type";//证件类型
+
 	public static final String DELIVERY_COST = "delivery_cost";//证件类型
 	public static final String ORDER_RECEIVE_STATUS = "order_receive_status";//包间上架状态
 	public static final String LOGPM_UNIT = "logpm_unit";//包件上架状态
@@ -57,6 +57,26 @@ public class DictBizConstant {
 
 
 
+	// 自提任务
+
+	/**
+	 * 自提任务状态
+	 */
+	public static final String  BILL_CONDITIONS_STATUS= "bill_conditions_status";
+
+	/**
+	 * 自提通知
+	 */
+	public static final String  BILL_NOTIFICATION_STATUS= "bill_notification_status";
+
+	/**
+	 * 证件类型
+	 */
+	public static final String  CERTIFICATE_TYPE= "certificate_type";
+
+
+
+
 
 
 

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

@@ -1,17 +1,9 @@
 package org.springblade.common.constant.billLading;
 
 public enum BillLadingStatusConstant {
-	ZC("正常","1"),
+	daitihuo("待提货","10"),
-	TJ("添加","2"),
+	yitihuo("已提货","20");
-	QX("取消","3"),
+
-	WTZ("未通知","1"),
-	YTZ("已通知","2"),
-	DBH("待备货","3"),
-	BHZ("备货中","4"),
-	BHWC("备货完成","5"),
-	YTH("已提货","6"),
-	YQS("已签收","7"),
-	YWC("已完成","8");
 
 
 

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

@@ -0,0 +1,42 @@
+package org.springblade.common.constant.billLading;
+
+/**
+ * 自提任务通知状态
+ */
+public enum BillNotificationStatusConstant {
+	weitongzhi("未通知", "0"),
+	yitongzhi("已通知", "1");
+
+
+	/**
+	 * 状态
+	 */
+	private String name;
+
+	/**
+	 * 值
+	 */
+	private String value;
+
+
+	private BillNotificationStatusConstant(String name, String value) {
+		this.name = name;
+		this.value = value;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getValue() {
+		return value;
+	}
+
+	public void setValue(String value) {
+		this.value = value;
+	}
+}

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

@@ -102,12 +102,7 @@ public class DistrilbutionBillLadingEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "证件类型")
 	private String certificateType;
-	/**
+
-	 * 证件类型
-	 */
-	@ApiModelProperty(value = "证件类型")
-	@TableField(exist = false)
-	private String certificateTypeName;
 	/**
 	 * 费用合计
 	 */
@@ -125,6 +120,9 @@ public class DistrilbutionBillLadingEntity extends TenantEntity {
 	@ApiModelProperty(value = "提货状态")
 	private String conditions; //提货状态
 
+	@ApiModelProperty("通知状态")
+	private String notificationStatus;
+
 
 
 

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

@@ -18,6 +18,7 @@ package com.logpm.distribution.vo;
 
 import com.logpm.distribution.entity.DistributionDeliveryChargeEntity;
 import com.logpm.distribution.entity.DistrilbutionBillLadingEntity;
+import io.swagger.annotations.ApiModelProperty;
 import io.swagger.models.auth.In;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -47,7 +48,7 @@ public class DistrilbutionBillLadingVO extends DistrilbutionBillLadingEntity {
 	private String totalNumber;
 	private String brand;
 	private String typeService;
-	private String conditionName; //提货状态
+
 	private String typeServiceName;
 	private String transport; //搬运
 	private String forklift; //叉车
@@ -59,6 +60,17 @@ public class DistrilbutionBillLadingVO extends DistrilbutionBillLadingEntity {
 	private Integer treatNum; //待
 	private Integer stopNum; //已
 
+	@ApiModelProperty(value = "提货状态")
+	private String conditionName;
+
+	@ApiModelProperty(value = "提货通知状态")
+	private String notificationStatusName;
+
+	@ApiModelProperty(value = "证件类型名称")
+	private String certificateTypeName;
+
 	private List<DistributionDeliveryChargeEntity> list;
 
+
+
 }

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

@@ -16,6 +16,9 @@
  */
 package com.logpm.distribution.controller;
 
+import com.logpm.distribution.service.IDistrilbutionBillLadingService;
+import com.logpm.distribution.vo.DistrilbutionBillLadingOwnVO;
+import com.logpm.distribution.vo.DistrilbutionBillLadingVO;
 import com.logpm.distribution.wrapper.DistributionStockupWrapper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -60,6 +63,7 @@ import javax.servlet.http.HttpServletResponse;
 public class DistributionStockupController extends BladeController {
 
 	private final IDistributionStockupService distributionStockupService;
+	private final IDistrilbutionBillLadingService distrilbutionBillLadingService;
 
 	/**
 	 * 备货信息表 详情
@@ -235,5 +239,17 @@ public class DistributionStockupController extends BladeController {
 		ExcelUtil.export(response, "备货信息表数据" + DateUtil.time(), "备货信息表数据表", list, DistributionStockupExcel.class);
 	}
 
+	/**
+	 * 根基备货任务查询备货任务关联的自提任务
+	 */
+	@GetMapping("/billStockList")
+	@ApiOperation(value = "详情", notes = "传入distributionStockup")
+	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/controller/DistrilbutionBillLadingController.java

@@ -137,14 +137,7 @@ public class DistrilbutionBillLadingController extends BladeController {
 		records.forEach( i ->{
 			i.setTypeServiceName(DictBizCache.getValue(DictBizConstant.DISTRIBUTION_TYPE, i.getTypeService()));
 			i.setCertificateTypeName(DictBizCache.getValue(DictBizConstant.CERTIFICATE_TYPE, i.getCertificateType()));
-//			dictBizClient.getList("distribution_type");
+
-		/*	Stream.of(BillLadingStatusConstant.values()).forEach(
-				ii ->{
-					if(i.getConditions().equals(ii.getValue())){
-						i.setConditionName(BillLadingStatusConstant.WTZ.getName());
-					}
-				}
-			);*/
 			// 遍历BillLadingStatusConstant的所有枚举值
 			Arrays.stream(BillLadingStatusConstant.values())
 				.filter(ii -> i.getConditions().equals(ii.getValue())) // 根据条件过滤

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

@@ -29,6 +29,7 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 提货单 Mapper 接口
@@ -86,4 +87,6 @@ public interface DistrilbutionBillLadingMapper extends BaseMapper<DistrilbutionB
 	DistrilbutionBillLadingVO getBillLadingNum(@Param("param") DistrilbutionBillLadingDTO billLadingEntity);
 
 	List<DistrilbutionBillLadingViewVO> getViewDetailOwn(String id);
+
+	List<DistrilbutionBillLadingVO> selectBillStockList(IPage<DistrilbutionBillLadingVO> page, @Param("distrilbutionBillLading") Map<String, Object> distrilbutionBillLading);
 }

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

@@ -221,5 +221,34 @@
         where ldbl.id = '1690989226694803457'
     </select>
 
+    <select id="selectBillStockList" resultType="com.logpm.distribution.vo.DistrilbutionBillLadingVO">
+        SELECT
+            dbl.id,
+            dsa.service_number serviceNumber,
+            dsa.waybill_number waybillNumber,
+            dsa.consignee_unit consigneeUnit,
+            dsa.customer_name customerName,
+            dsa.customer_telephone customerTelephone,
+            dsa.warehouse,
+            dsa.warehouse_entry_time warehouseEntryTime,
+            dsa.storage_fee storageFee,
+            dsa.total_number totalNumber,
+            dbl.certificate_type certificateType,
+            dsa.brand,
+            dsa.type_service typeService,
+            dbl.pick_up_time pickUpTime,
+            dbl.consignee,
+            dbl.delivery_document deliveryDocument,
+            dbl.conditions,
+            dbl.notification_status,
+            dbl.total_cost totalCost,
+            dbl.pick_up_plate pickUpPlate
+        FROM
+            logpm_distrilbution_bill_lading dbl
+        LEFT JOIN logpm_distribution_stock_article dsa ON dbl.stock_article_id = dsa.id
+        LEFT JOIN logpm_distribution_stockup_info ldsi on dbl.id = ldsi.reservation_id and ldsi.stock_up_type=#{distrilbutionBillLading.stockupType}
+        where ldsi.stockup_id=#{distrilbutionBillLading.id};
+    </select>
+
 
 </mapper>

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

@@ -93,7 +93,6 @@ public interface IDistributionStockupService extends BaseService<DistributionSto
 	/**
 	 * 库存品信息详细
 	 * @param page
-	 * @param parseLong
 	 * @return
 	 */
 	IPage<DistributionStockupVO> getInventoryOwn(IPage<Object> page, Long id);
@@ -103,4 +102,8 @@ public interface IDistributionStockupService extends BaseService<DistributionSto
 	String selectStockupAreaByReservationId(Long id);
 
 	DistributionStockupVO detailOwnSelf(Long id);
+
+
+
+
 }

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

@@ -136,5 +136,13 @@ public interface IDistrilbutionBillLadingService extends BaseService<Distrilbuti
 	List<DistrilbutionBillLadingViewVO> getViewDetailOwn(String id);
 
 
+	/**
+	 * 根基备货任务ID查询自提信息
+	 * @param page
+	 * @param distrilbutionBillLading
+	 * @return
+	 */
+	IPage<DistrilbutionBillLadingVO> billStockList(IPage<DistrilbutionBillLadingVO> page,Map<String, Object> distrilbutionBillLading);
+
 
 }

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

@@ -475,4 +475,6 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 		DistributionStockupVO distributionStockupVO =DistributionStockupWrapper.build().entityVO(distributionStockupEntity);
 		return distributionStockupVO;
 	}
+
+
 }

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

@@ -365,7 +365,6 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 				//不存在
 				DistrilbutionBillStockEntity stockEntity = new DistrilbutionBillStockVO();
 				stockEntity.setId(i.getId());
-				stockEntity.setOrderStatus(BillLadingStatusConstant.QX.getValue());
 				stockEntity.setConditions(i.getConditions());
 				stockEntity.setStockArticleId(i.getStockArticleId());
 				deList.add(stockEntity);
@@ -400,7 +399,6 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 
 			DistrilbutionBillStockEntity distrilbutionBillStock = new DistrilbutionBillStockVO();
 			distrilbutionBillStock.setBillLadingId(id);
-			distrilbutionBillStock.setOrderStatus(BillLadingStatusConstant.TJ.getValue());
 			distrilbutionBillStock.setStockArticleId(i.getId());
 			distrilbutionBillStock.setConditions("1");
 			list1.add(distrilbutionBillStock);
@@ -1075,7 +1073,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 			String s = split[i];
 			//修改提货状态
 			DistrilbutionBillLadingEntity billLadingEntity = new DistrilbutionBillLadingEntity();
-			billLadingEntity.setConditions(BillLadingStatusConstant.YQS.getValue());
+			billLadingEntity.setConditions(BillLadingStatusConstant.yitihuo.getValue());
 			billLadingEntity.setId(Long.parseLong(s));
 			this.updateById(billLadingEntity);
 			//修改订单状态
@@ -1164,6 +1162,17 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 
 		return distributionStockupEntity;
 
+	}
 
+	@Override
+	public IPage<DistrilbutionBillLadingVO> billStockList(IPage<DistrilbutionBillLadingVO> page, Map<String, Object> distrilbutionBillLading) {
+		List<DistrilbutionBillLadingVO> result =baseMapper.selectBillStockList(page,distrilbutionBillLading);
+		for (DistrilbutionBillLadingVO distrilbutionBillLadingVO : result) {
+			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()));
+		}
+		page.setRecords(result);
+		return page;
 	}
 }