修改自提查看，编辑

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

@@ -25,6 +25,8 @@ 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 LOGPM_UNIT = "logpm_unit";//包间上架状态
 
 

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

@@ -0,0 +1,50 @@
+package org.springblade.common.constant.billLading;
+
+public enum BillLadingStatusConstant {
+	ZC("正常","1"),
+	TJ("添加","2"),
+	QX("取消","3"),
+	WTZ("未通知","1"),
+	YTZ("已通知","2"),
+	DBH("待备货","3"),
+	BHZ("备货中","4"),
+	BHWC("备货完成","5"),
+	YTH("已提货","6"),
+	YQS("已签收","7"),
+	YWC("已完成","8");
+
+
+
+
+	/**
+	 * 状态
+	 */
+	private String name;
+
+	/**
+	 * 值
+	 */
+	private String value;
+
+
+	private BillLadingStatusConstant(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/DistributionDeliveryChargeEntity.java

@@ -16,6 +16,7 @@
  */
 package com.logpm.distribution.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import io.swagger.annotations.ApiModel;
@@ -72,6 +73,12 @@ public class DistributionDeliveryChargeEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "费用类型")
 	private String cost;
+	/**
+	 * 费用类型
+	 */
+	@ApiModelProperty(value = "费用类型")
+	@TableField(exist = false)
+	private String costName;
 	/**
 	 * 金额
 	 */

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

@@ -81,5 +81,10 @@ public class DistributionDeliveryDetailsEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "状态")
 	private String conditions;
+	/**
+	 * 状态
+	 */
+	@ApiModelProperty(value = "状态")
+	private String inventoryStatus;
 
 }

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

@@ -102,6 +102,11 @@ public class DistrilbutionBillLadingEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "证件类型")
 	private String certificateType;
+	/**
+	 * 证件类型
+	 */
+	@ApiModelProperty(value = "证件类型")
+	private String certificateTypeName;
 	/**
 	 * 费用合计
 	 */

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

@@ -76,6 +76,11 @@ public class DistrilbutionBillStockEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "状态")
 	private String conditions;
+	/**
+	 * 订单状态
+	 */
+	@ApiModelProperty(value = "订单状态")
+	private String orderStatus;
 
 
 }

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

@@ -0,0 +1,20 @@
+package com.logpm.distribution.vo;
+
+import lombok.Data;
+
+/**
+ * @program: LogisticsPlatform-Service
+ * @description:
+ * @author: cyz
+ * @create: 2023-08-15 11:42
+ **/
+@Data
+public class DistributionBillInventoryVO {
+	private String sku;
+	private String descriptionGoods;
+	private String quantity;
+	private String cargoNumber;
+	private String cargoUnit;
+	private String allocation;
+	private String preparedQuantity; //以扫
+}

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

@@ -0,0 +1,22 @@
+package com.logpm.distribution.vo;
+
+import lombok.Data;
+
+/**
+ * @program: LogisticsPlatform-Service
+ * @description:
+ * @author: cyz
+ * @create: 2023-08-15 11:13
+ **/
+@Data
+public class DistributionBillOrderPackVO {
+	private String orderPackageCode;
+	private String warehouse;
+	private String firsts;
+	private String second;
+	private String thirdProduct;
+	private String materialCode;
+	private String materialName;
+	private String pallet;
+	private String goodsAllocation;
+}

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

@@ -0,0 +1,23 @@
+package com.logpm.distribution.vo;
+
+import lombok.Data;
+
+/**
+ * @program: LogisticsPlatform-Service
+ * @description:
+ * @author: cyz
+ * @create: 2023-08-15 09:52
+ **/
+@Data
+public class DistributionBillOrderVO {
+	private String orderCode;
+	private String descriptionGoods;
+	private String stockupStatus;
+	private String stockupStatusName;
+	private String handQuantity;
+	private String materialName;
+	private String preparedQuantity;
+	private String goodsAllocation;
+	private String pallet;
+
+}

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

@@ -16,10 +16,7 @@
  */
 package com.logpm.distribution.vo;
 
-import com.logpm.distribution.entity.DistributionDeliveryChargeEntity;
-import com.logpm.distribution.entity.DistributionParcelListEntity;
-import com.logpm.distribution.entity.DistributionPrintEntity;
-import com.logpm.distribution.entity.DistrilbutionBillLadingEntity;
+import com.logpm.distribution.entity.*;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -38,7 +35,7 @@ public class DistrilbutionBillLadingDetailsVO extends DistrilbutionBillLadingEnt
 	/**
 	 * 订单数据
 	 */
-	private List<DistributionParcelListEntity> stockArticleVOS;
+	private List<DistributionStockArticleEntity> stockArticleVOS;
 	/**
 	 * 库存品数据
 	 */

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.models.auth.In;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -55,6 +56,9 @@ public class DistrilbutionBillLadingVO extends DistrilbutionBillLadingEntity {
 	private String stockupStatusName;
 	private String assignStatusName;
 
+	private Integer treatNum; //待
+	private Integer stopNum; //已
+
 	private List<DistributionDeliveryChargeEntity> list;
 
 }

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

@@ -0,0 +1,22 @@
+package com.logpm.distribution.vo;
+
+import lombok.Data;
+
+/**
+ * @program: LogisticsPlatform-Service
+ * @description:
+ * @author: cyz
+ * @create: 2023-08-14 21:02
+ **/
+@Data
+public class DistrilbutionBillLadingViewVO {
+
+	private String pickupBatch;
+	private String waybillNumber;
+	private String serviceNumber;
+	private String consigneeUnit;
+	private String customerName;
+	private String customerTelephone;
+
+
+}

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

@@ -16,6 +16,7 @@
  */
 package com.logpm.distribution.controller;
 
+import com.logpm.distribution.vo.DistributionBillInventoryVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -78,6 +79,16 @@ public class DistributionDeliveryDetailsController extends BladeController {
 		IPage<DistributionDeliveryDetailsEntity> pages = distributionDeliveryDetailsService.page(Condition.getPage(query), Condition.getQueryWrapper(distributionDeliveryDetails, DistributionDeliveryDetailsEntity.class));
 		return R.data(pages);
 	}
+	/**
+	 * 提货订单明细 分页
+	 */
+	@GetMapping("/billOrderInventory")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入distributionDeliveryDetails")
+	public R<IPage<DistributionBillInventoryVO>> getBillOrderInventory(@ApiIgnore @RequestParam Map<String, Object> distributionDeliveryDetails, Query query) {
+		IPage<DistributionBillInventoryVO> pages = distributionDeliveryDetailsService.getBillOrderInventory(Condition.getPage(query),distributionDeliveryDetails);
+		return R.data(pages);
+	}
 
 	/**
 	 * 提货订单明细 自定义分页

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

@@ -89,10 +89,16 @@ public class DistributionStockArticleController extends BladeController {
 		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");
 		QueryWrapper<DistributionStockArticleEntity> queryWrapper = Condition.getQueryWrapper(distributionStockArticle, DistributionStockArticleEntity.class);
+		if(Func.isNotEmpty(reservation)){
+			queryWrapper.in("reservation_status","10");
+
+		}
 		if(Func.isNotEmpty(o)){
 			queryWrapper.in("order_self_numbering",String.valueOf(o).split(","));
 		}

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

@@ -24,15 +24,14 @@ import com.logpm.distribution.dto.DistrilbutionBillLadingDTO;
 import com.logpm.distribution.entity.DistrilbutionBillLadingEntity;
 import com.logpm.distribution.excel.DistrilbutionBillLadingExcel;
 import com.logpm.distribution.service.IDistrilbutionBillLadingService;
-import com.logpm.distribution.vo.DistrilbutionBillLadingDetailsVO;
-import com.logpm.distribution.vo.DistrilbutionBillLadingOwnVO;
-import com.logpm.distribution.vo.DistrilbutionBillLadingVO;
+import com.logpm.distribution.vo.*;
 import com.logpm.distribution.wrapper.DistrilbutionBillLadingWrapper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import org.springblade.common.constant.DictBizConstant;
+import org.springblade.common.constant.billLading.BillLadingStatusConstant;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.excel.util.ExcelUtil;
 import org.springblade.core.mp.support.Condition;
@@ -51,9 +50,11 @@ import springfox.documentation.annotations.ApiIgnore;
 
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.stream.Stream;
 
 /**
  * 提货单 控制器
@@ -82,6 +83,27 @@ public class DistrilbutionBillLadingController extends BladeController {
 		DistrilbutionBillLadingDetailsVO detail = distrilbutionBillLadingService.getDetailOne(distrilbutionBillLading);
 		return R.data(detail);
 	}
+	/**
+	 * 提货单 详情
+	 */
+	@GetMapping("/listNum")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入distrilbutionBillLading")
+	public R<DistrilbutionBillLadingVO> listNum(@ApiIgnore @RequestParam Map<String, Object> distrilbutionBillLading) {
+		DistrilbutionBillLadingVO detail = distrilbutionBillLadingService.listNum(distrilbutionBillLading);
+		return R.data(detail);
+	}
+	/**
+	 * 提货单 详情
+	 */
+	@GetMapping("/viewDetailOwn")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入distrilbutionBillLading")
+	public R<List<DistrilbutionBillLadingViewVO>> getViewDetailOwn(@RequestParam String id) {
+		List<DistrilbutionBillLadingViewVO> detail = distrilbutionBillLadingService.getViewDetailOwn(id);
+		return R.data(detail);
+	}
+
 	/**
 	 * 提货单 分页
 	 */
@@ -97,6 +119,7 @@ public class DistrilbutionBillLadingController extends BladeController {
 		}
 		QueryWrapper<DistrilbutionBillLadingEntity> queryWrapper = Condition.getQueryWrapper(distrilbutionBillLading, DistrilbutionBillLadingEntity.class);
 		queryWrapper.between(StringUtils.isNotEmpty((CharSequence) o),"pick_up_time",o,o1);
+		queryWrapper.orderByDesc("create_time");
 		IPage<DistrilbutionBillLadingEntity> pages = distrilbutionBillLadingService.page(Condition.getPage(query),queryWrapper );
 		return R.data(DistrilbutionBillLadingWrapper.build().pageVO(pages));
 	}
@@ -112,41 +135,22 @@ public class DistrilbutionBillLadingController extends BladeController {
 		IPage<DistrilbutionBillLadingVO> pages = distrilbutionBillLadingService.pageList(Condition.getPage(query), distrilbutionBillLading);
 		List<DistrilbutionBillLadingVO> records = pages.getRecords();
 		records.forEach( i ->{
-			String typeService = i.getTypeService();
-			String value = DictBizCache.getValue(DictBizConstant.DISTRIBUTION_TYPE, i.getTypeService());
-			i.setTypeServiceName(value);
+			i.setTypeServiceName(DictBizCache.getValue(DictBizConstant.DISTRIBUTION_TYPE, i.getTypeService()));
+			i.setCertificateTypeName(DictBizCache.getValue(DictBizConstant.CERTIFICATE_TYPE, i.getCertificateType()));
 //			dictBizClient.getList("distribution_type");
-			if(!Objects.isNull(i.getTypeService())){
-				if(Func.isNotEmpty(typeService)){
-
-					switch (Integer.parseInt(i.getConditions())){
-						case 1:
-							i.setConditionName("未通知");
-							break;
-						case 2:
-							i.setConditionName("已通知");
-							break;
-						case 3:
-							i.setConditionName("待备货");
-							break;
-						case 4:
-							i.setConditionName("备货中");
-							break;
-						case 5:
-							i.setConditionName("备货完成");
-							break;
-						case 6:
-							i.setConditionName("已提货");
-							break;
-						case 7:
-							i.setConditionName("已完成");
-							break;
-						default:
-							i.setConditionName("无");
-							break;
+		/*	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())) // 根据条件过滤
+				.findFirst() // 找到第一个匹配的枚举值
+				.ifPresent(ii -> i.setConditionName(ii.getName())); // 修改属性值（如果有匹配的枚举值）
+
 		} );
 
 		return R.data(pages);
@@ -236,6 +240,16 @@ public class DistrilbutionBillLadingController extends BladeController {
 	public R update(@Valid @RequestBody DistrilbutionBillLadingEntity distrilbutionBillLading) {
 		return R.status(distrilbutionBillLadingService.updateById(distrilbutionBillLading));
 	}
+	/**
+	 * 提货单 自己修改
+	 */
+	@PostMapping("/updateOwn")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入distrilbutionBillLading")
+	public R updateOwn(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		Boolean st = distrilbutionBillLadingService.updateOwn(ids);
+		return R.status(st);
+	}
 
 	/**
 	 * 提货单 新增或修改

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

@@ -16,6 +16,9 @@
  */
 package com.logpm.distribution.controller;
 
+import com.logpm.distribution.vo.DistributionBillOrderPackVO;
+import com.logpm.distribution.vo.DistributionBillOrderVO;
+import com.logpm.distribution.vo.DistributionStockArticleVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -52,7 +55,7 @@ import javax.servlet.http.HttpServletResponse;
  */
 @RestController
 @AllArgsConstructor
-@RequestMapping("blade-distrilbutionBillStock/distrilbutionBillStock")
+@RequestMapping("/distrilbutionBillStock")
 @Api(value = "提货单订单信息关联", tags = "提货单订单信息关联接口")
 public class DistrilbutionBillStockController extends BladeController {
 
@@ -68,6 +71,28 @@ public class DistrilbutionBillStockController extends BladeController {
 		DistrilbutionBillStockEntity detail = distrilbutionBillStockService.getOne(Condition.getQueryWrapper(distrilbutionBillStock));
 		return R.data(detail);
 	}
+
+	/**
+	 * 提货单 详情
+	 */
+	@GetMapping("/billOrderDetail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入distrilbutionBillLading")
+	public R<IPage<DistributionBillOrderVO>> getBillOrderDetail(@ApiIgnore @RequestParam Map<String, Object> distrilbutionBillStock, Query query) {
+		IPage<DistributionBillOrderVO> detail = distrilbutionBillStockService.getBillOrderDetail(distrilbutionBillStock,Condition.getPage(query));
+		return R.data(detail);
+	}
+	/**
+	 * 提货单 详情
+	 */
+	@GetMapping("/billOrderPack")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入distrilbutionBillLading")
+	public R<IPage<DistributionBillOrderPackVO>> getBillOrderPack(@ApiIgnore @RequestParam Map<String, Object> distrilbutionBillStock, Query query) {
+		IPage<DistributionBillOrderPackVO> detail = distrilbutionBillStockService.getBillOrderPack(distrilbutionBillStock,Condition.getPage(query));
+		return R.data(detail);
+	}
+
 	/**
 	 * 提货单订单信息关联 分页
 	 */

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

@@ -17,6 +17,7 @@
 package com.logpm.distribution.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.logpm.distribution.entity.DistributionStockArticleEntity;
 import com.logpm.distribution.entity.DistrilbutionBillLadingEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -96,6 +97,14 @@ public class DistrilbutionBillLadingDTO extends DistrilbutionBillLadingEntity {
 	 *  提货人
 	 */
 	private  String consignee;
+	/**
+	 *  开始时间
+	 */
+	private  String startDate;
+	/**
+	 *  结束时间
+	 */
+	private  String entDate;
 	/**
 	 *  提货车牌
 	 */
@@ -116,6 +125,10 @@ public class DistrilbutionBillLadingDTO extends DistrilbutionBillLadingEntity {
 	 * 库存品
 	 */
 	private  List<DistributionStockListDTO> stockDTOList;
+	/**
+	 * 订单数据
+	 */
+	private  List<DistributionStockArticleEntity> stockArticleList;
 
 	private List<Print> printList;
 

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

@@ -17,6 +17,7 @@
 package com.logpm.distribution.mapper;
 
 import com.logpm.distribution.entity.DistributionDeliveryDetailsEntity;
+import com.logpm.distribution.vo.DistributionBillInventoryVO;
 import com.logpm.distribution.vo.DistributionDeliveryDetailsVO;
 import com.logpm.distribution.excel.DistributionDeliveryDetailsExcel;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -65,4 +66,6 @@ public interface DistributionDeliveryDetailsMapper extends BaseMapper<Distributi
 	 * @return
 	 */
 	DistrilbutionBillLadingInventoryAppVO listCode(@Param("billLadingId") String billLadingId,@Param("coding") String coding);
+
+    IPage<DistributionBillInventoryVO> getBillOrderInventory(IPage<Object> page, @Param("param") DistributionDeliveryDetailsEntity deliveryDetails);
 }

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

@@ -48,5 +48,18 @@
         from logpm_distribution_delivery_details lddd LEFT JOIN logpm_distribution_stock lds on lddd.stock_list_id = lds.stock_list_id
         where lddd.is_deleted = 0 and lddd.bill_lading_id = #{billLadingId} and lds.coding = #{coding}
     </select>
+    <select id="getBillOrderInventory" resultType="com.logpm.distribution.vo.DistributionBillInventoryVO">
+        select ldsl.sku, ldsl.description_goods descriptionGoods, lddd.quantity, ldsl.cargo_number cargoNumber, ldsl.cargo_unit cargoUnit,
+               ldsl.tray_name trayName, ldsa.allocation,
+               (select count(lds.id)
+                from logpm_distribution_stock lds
+                where lds.stock_list_id = lddd.stock_list_id  ) preparedQuantity
+        from logpm_distribution_delivery_details lddd
+                 LEFT JOIN logpm_distribution_stock_list ldsl on lddd.stock_list_id = ldsl.id
+                 LEFT JOIN logpm_distribution_stock_article ldsa on ldsa.id = ldsl.stock_article_id
+        <where>
+            lddd.bill_lading_id = #{param.billLadingId} and lddd.inventory_status in (1,2)
+        </where>
+    </select>
 
 </mapper>

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

@@ -23,10 +23,7 @@ import com.logpm.distribution.dto.DistrilbutionBillLadingDTO;
 import com.logpm.distribution.dto.app.BillLadingAppDTO;
 import com.logpm.distribution.entity.DistrilbutionBillLadingEntity;
 import com.logpm.distribution.excel.DistrilbutionBillLadingExcel;
-import com.logpm.distribution.vo.DistrilbutionBillLadingAppVO;
-import com.logpm.distribution.vo.DistrilbutionBillLadingDetailsVO;
-import com.logpm.distribution.vo.DistrilbutionBillLadingOwnVO;
-import com.logpm.distribution.vo.DistrilbutionBillLadingVO;
+import com.logpm.distribution.vo.*;
 import com.logpm.distribution.vo.app.DistrilbutionAppBillLadingDetailVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -85,4 +82,8 @@ public interface DistrilbutionBillLadingMapper extends BaseMapper<DistrilbutionB
 	 * @return
 	 */
     IPage<DistrilbutionBillLadingAppVO> getInventory(IPage<Object> page,@Param("param") DistrilbutionBillLadingEntity distrilbutionBillLadingEntity);
+
+	DistrilbutionBillLadingVO getBillLadingNum(@Param("param") DistrilbutionBillLadingDTO billLadingEntity);
+
+	List<DistrilbutionBillLadingViewVO> getViewDetailOwn(String id);
 }

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

@@ -28,8 +28,9 @@
     <select id="pageList" 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,
-               dsa.brand,dsa.type_service typeService,dbl.pick_up_time,dbl.consignee,dbl.delivery_document,dbl.conditions,dbl.total_cost totalCost
+            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.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
         <where>
@@ -42,12 +43,13 @@
             <if test="param.customerTelephone != null and param.customerTelephone != ''">and dsa.customer_telephone like concat('%',#{param.customerTelephone},'%')</if>
             <if test="param.warehouse != null and param.warehouse != ''">and dsa.warehouse like concat('%',#{param.warehouse},'%')</if>
             <if test="param.warehouseEntryTime != null ">and date(dsa.warehouse_entry_time) = #{param.warehouseEntryTime}</if>
+            <if test="param.startDate != null ">and dsa.warehouse_entry_time between #{param.startDate} and #{param.entDate} </if>
             <if test="param.brand != null and param.brand != ''">and dsa.brand like concat('%',#{param.brand},'%')</if>
             <if test="param.typeService != null and param.typeService != ''">and dsa.type_service = #{param.typeService},=</if>
-            <if test="param.productInformation != null and param.productInformation != ''">and dsa.product_information like concat('%',#{param.productInformation},'%')</if>
+            <if test="param.productInformation != null and param.productInformation != ''">and dsa.allocation like concat('%',#{param.productInformation},'%')</if>
             <if test="param.pickupPhone != null and param.pickupPhone != ''">and dbl.pickup_phone concat('%',#{param.pickupPhone},'%')</if>
             <if test="param.consignee != null and param.consignee != ''">and dbl.consignee like concat('%',#{param.consignee},'%')</if>
-            <if test="param.pickUpPlate != null and param.pickUpPlate != ''">and dbl.pick_up_late like concat('%',#{param.pickUpPlate},'%')</if>
+            <if test="param.pickUpPlate != null and param.pickUpPlate != ''">and dbl.pick_up_plate like concat('%',#{param.pickUpPlate},'%')</if>
             <if test="param.deliveryDocument != null and param.deliveryDocument != ''">and dbl.delivery_document like concat('%',#{param.deliveryDocument},'%')</if>
             <if test="param.certificateType != null and param.certificateType != ''">and dbl.certificate_type = #{param.certificateType},</if>
 
@@ -187,7 +189,37 @@
             ldbl.id  = #{param.id} and lddd.is_deleted = '0'
         </where>
     </select>
+    <select id="getBillLadingNum" resultType="com.logpm.distribution.vo.DistrilbutionBillLadingVO">
+        select (select count(conditions)
+                from logpm_distrilbution_bill_lading
+                <where>
+                      conditions IN (1, 2, 3,4,5) and  is_deleted = '0'
+                    <if test="param.startDate != null">and pick_up_time between #{param.startDate} and #{param.entDate}</if>
+                    <if test="param.startDate == null">and  DATE(pick_up_time) = CURDATE() </if>
+                </where>)  treatNum,
+            (select count(conditions)
+        from logpm_distrilbution_bill_lading
+        <where>
+            conditions IN (6, 7, 8) and  is_deleted = '0'
+            <if test="param.startDate != null">and pick_up_time between #{param.startDate} and #{param.entDate}</if>
+            <if test="param.startDate == null">and  DATE(pick_up_time) = CURDATE() </if>
+        </where> ) stopNum
+        from logpm_distrilbution_bill_lading
+        <where>
+            is_deleted = '0'
+            <if test="param.startDate != null">and pick_up_time between #{param.startDate} and #{param.entDate}</if>
+            <if test="param.startDate == null">and  DATE(pick_up_time) = CURDATE() </if>
 
+        </where>
+    </select>
+    <select id="getViewDetailOwn" resultType="com.logpm.distribution.vo.DistrilbutionBillLadingViewVO">
+        select DISTINCT ldbl.pickup_batch pickupBatch,ldsa.waybill_number waybillNumber, ldsa.service_number serviceNumber, ldsa.consignee_unit consigneeUnit,
+                        ldsa.customer_name customerName, ldsa.customer_telephone customerTelephone
+        from logpm_distrilbution_bill_lading ldbl
+                 LEFT JOIN logpm_distrilbution_bill_stock ldbs on ldbl.id = ldbs.bill_lading_id
+                 LEFT JOIN logpm_distribution_stock_article ldsa on ldbs.stock_article_id = ldsa.id
+        where ldbl.id = '1690989226694803457'
+    </select>
 
 
 </mapper>

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

@@ -17,6 +17,9 @@
 package com.logpm.distribution.mapper;
 
 import com.logpm.distribution.entity.DistrilbutionBillStockEntity;
+import com.logpm.distribution.vo.DistributionBillOrderPackVO;
+import com.logpm.distribution.vo.DistributionBillOrderVO;
+import com.logpm.distribution.vo.DistributionStockArticleVO;
 import com.logpm.distribution.vo.DistrilbutionBillStockVO;
 import com.logpm.distribution.excel.DistrilbutionBillStockExcel;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -51,4 +54,7 @@ public interface DistrilbutionBillStockMapper extends BaseMapper<DistrilbutionBi
 	 */
 	List<DistrilbutionBillStockExcel> exportDistrilbutionBillStock(@Param("ew") Wrapper<DistrilbutionBillStockEntity> queryWrapper);
 
+	IPage<DistributionBillOrderVO> getBillOrderDetail(IPage page,@Param("param") DistrilbutionBillStockEntity distrilbutionBillStock);
+
+	IPage<DistributionBillOrderPackVO> getBillOrderPack(IPage<Object> page,@Param("param") DistrilbutionBillStockEntity billStock);
 }

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

@@ -15,5 +15,37 @@
     <select id="exportDistrilbutionBillStock" resultType="com.logpm.distribution.excel.DistrilbutionBillStockExcel">
         SELECT * FROM logpm_distrilbution_bill_stock ${ew.customSqlSegment}
     </select>
+    <select id="getBillOrderDetail" resultType="com.logpm.distribution.vo.DistributionBillOrderVO">
+        select DISTINCT ldsa.order_code orderCode,ldsa.description_goods descriptionGoods,ldsa.stockup_status stockupStatus,ldsa.hand_quantity handQuantity,
+               (select GROUP_CONCAT(IFNULL(ldpl.material_name , '') SEPARATOR ', ')
+                from logpm_distribution_parcel_list ldpl
+                where  ldpl.material_name is not null and ldpl.stock_article_id = ldbs.stock_article_id)   materialName,
+               (select count(lds.id)
+                from logpm_distribution_stock lds
+                where lds.stock_article = ldbs.stock_article_id  ) preparedQuantity ,
+               (select GROUP_CONCAT(IFNULL(ldpl.pallet , '') SEPARATOR ', ')
+                from logpm_distribution_parcel_list ldpl
+                where  ldpl.pallet is not null and ldpl.stock_article_id = ldbs.stock_article_id) pallet ,
+               (select GROUP_CONCAT(IFNULL(ldpl.goods_allocation , '') SEPARATOR ', ')
+                from logpm_distribution_parcel_list ldpl
+                where  ldpl.goods_allocation is not null and ldpl.stock_article_id = ldbs.stock_article_id)  goodsAllocation
+
+        from logpm_distrilbution_bill_stock ldbs
+                 LEFT JOIN logpm_distribution_stock_article ldsa on ldbs.stock_article_id = ldsa.id
+                 LEFT JOIN logpm_distribution_stock lds on lds.stock_article = ldbs.stock_article_id
+        <where>
+            ldbs.is_deleted = 0 and  ldbs.bill_lading_id = #{param.billLadingId}  and ldbs.order_status in (1,2)
+        </where>
+
+    </select>
+    <select id="getBillOrderPack" resultType="com.logpm.distribution.vo.DistributionBillOrderPackVO">
+        select ldpl.order_package_code orderPackageCode,ldpl.warehouse ,ldpl.firsts ,ldpl.second ,ldpl.third_product thirdProduct,
+               ldpl.material_code materialCode,ldpl.material_name materialName,ldpl.pallet ,ldpl.goods_allocation goodsAllocation
+        from logpm_distrilbution_bill_stock ldbs
+                 LEFT JOIN logpm_distribution_parcel_list ldpl on ldbs.stock_article_id = ldpl.stock_article_id
+        <where>
+            ldbs.bill_lading_id = #{param.billLadingId} and ldbs.order_status in (1,2)
+        </where>
+    </select>
 
 </mapper>

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

@@ -18,6 +18,7 @@ package com.logpm.distribution.service;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.logpm.distribution.entity.DistributionDeliveryDetailsEntity;
+import com.logpm.distribution.vo.DistributionBillInventoryVO;
 import com.logpm.distribution.vo.DistributionDeliveryDetailsVO;
 import com.logpm.distribution.excel.DistributionDeliveryDetailsExcel;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -25,6 +26,7 @@ import com.logpm.distribution.vo.DistrilbutionBillLadingAppVO;
 import com.logpm.distribution.vo.app.DistrilbutionBillLadingInventoryAppVO;
 import org.springblade.core.mp.base.BaseService;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 提货订单明细 服务类
@@ -59,4 +61,6 @@ public interface IDistributionDeliveryDetailsService extends BaseService<Distrib
     DistributionDeliveryDetailsVO oneListNum(Long billLadingId);
 
 	DistrilbutionBillLadingInventoryAppVO listCode(String billLadingId, String coding);
+
+    IPage<DistributionBillInventoryVO> getBillOrderInventory(IPage<Object> page, Map<String, Object> distributionDeliveryDetails);
 }

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

@@ -22,13 +22,9 @@ import com.logpm.distribution.dto.DistrilbutionBillLadingDTO;
 import com.logpm.distribution.dto.app.BillLadingAppDTO;
 import com.logpm.distribution.entity.DistrilbutionBillLadingEntity;
 import com.logpm.distribution.excel.DistrilbutionBillLadingExcel;
-import com.logpm.distribution.vo.DistrilbutionBillLadingAppVO;
-import com.logpm.distribution.vo.DistrilbutionBillLadingDetailsVO;
-import com.logpm.distribution.vo.DistrilbutionBillLadingOwnVO;
-import com.logpm.distribution.vo.DistrilbutionBillLadingVO;
+import com.logpm.distribution.vo.*;
 import com.logpm.distribution.vo.app.DistrilbutionAppBillLadingOrderMainVO;
 import org.springblade.core.mp.base.BaseService;
-import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 
 import java.util.List;
@@ -122,4 +118,22 @@ public interface IDistrilbutionBillLadingService extends BaseService<Distrilbuti
 	 * @return
 	 */
 	IPage<DistrilbutionBillLadingAppVO> getInventoryNum(IPage<Object> page, Map<String, Object> distrilbutionBillLading);
+
+	Boolean updateOwn(String ids);
+
+	/**
+	 * 查询数据
+	 * @param distrilbutionBillLading
+	 * @return
+	 */
+	DistrilbutionBillLadingVO listNum(Map<String, Object> distrilbutionBillLading);
+
+	/**
+	 * 查询详情详细
+	 * @param id
+	 * @return
+	 */
+	List<DistrilbutionBillLadingViewVO> getViewDetailOwn(String id);
+
+
 }

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

@@ -18,11 +18,15 @@ package com.logpm.distribution.service;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.logpm.distribution.entity.DistrilbutionBillStockEntity;
+import com.logpm.distribution.vo.DistributionBillOrderPackVO;
+import com.logpm.distribution.vo.DistributionBillOrderVO;
+import com.logpm.distribution.vo.DistributionStockArticleVO;
 import com.logpm.distribution.vo.DistrilbutionBillStockVO;
 import com.logpm.distribution.excel.DistrilbutionBillStockExcel;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseService;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 提货单订单信息关联 服务类
@@ -31,6 +35,15 @@ import java.util.List;
  * @since 2023-07-25
  */
 public interface IDistrilbutionBillStockService extends BaseService<DistrilbutionBillStockEntity> {
+
+	/**
+	 * 查询订单
+	 *
+	 * @param distrilbutionBillStock
+	 * @param page
+	 * @return
+	 */
+	IPage<DistributionBillOrderVO> getBillOrderDetail(Map<String, Object> distrilbutionBillStock,IPage page);
 	/**
 	 * 自定义分页
 	 *
@@ -49,4 +62,5 @@ public interface IDistrilbutionBillStockService extends BaseService<Distrilbutio
 	 */
 	List<DistrilbutionBillStockExcel> exportDistrilbutionBillStock(Wrapper<DistrilbutionBillStockEntity> queryWrapper);
 
+	IPage<DistributionBillOrderPackVO> getBillOrderPack(Map<String, Object> distrilbutionBillStock, IPage<Object> page);
 }

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

@@ -16,7 +16,9 @@
  */
 package com.logpm.distribution.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.logpm.distribution.entity.DistributionDeliveryDetailsEntity;
+import com.logpm.distribution.vo.DistributionBillInventoryVO;
 import com.logpm.distribution.vo.DistributionDeliveryDetailsVO;
 import com.logpm.distribution.excel.DistributionDeliveryDetailsExcel;
 import com.logpm.distribution.mapper.DistributionDeliveryDetailsMapper;
@@ -27,6 +29,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 提货订单明细 服务实现类
@@ -67,4 +70,10 @@ public class DistributionDeliveryDetailsServiceImpl extends BaseServiceImpl<Dist
 		return baseMapper.listCode(billLadingId,coding) ;
 	}
 
+	@Override
+	public IPage<DistributionBillInventoryVO> getBillOrderInventory(IPage<Object> page, Map<String, Object> distributionDeliveryDetails) {
+		DistributionDeliveryDetailsEntity deliveryDetails = JSON.parseObject(JSON.toJSONString(distributionDeliveryDetails), DistributionDeliveryDetailsEntity.class);
+		return baseMapper.getBillOrderInventory(page,deliveryDetails);
+	}
+
 }

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

@@ -16,6 +16,7 @@
  */
 package com.logpm.distribution.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -36,18 +37,22 @@ import com.logpm.distribution.vo.app.DistrilbutionAppBillLadingDetailVO;
 import com.logpm.distribution.vo.app.DistrilbutionAppBillLadingOrderMainVO;
 import com.logpm.distribution.vo.app.DistrilbutionAppBillLadingOrderVO;
 import com.logpm.distribution.vo.app.DistrilbutionBillLadingInventoryAppVO;
+import com.logpm.distribution.wrapper.DistributionStockArticleWrapper;
 import lombok.AllArgsConstructor;
+import org.springblade.common.constant.DictBizConstant;
+import org.springblade.common.constant.billLading.BillLadingStatusConstant;
 import org.springblade.common.constant.order.OrderReservationStatusConstant;
 import org.springblade.common.constant.order.OrderStatusConstant;
 import org.springblade.common.constant.stockup.StockAssignStatusConstant;
 import org.springblade.common.constant.stockup.StockupStatusConstant;
-import org.springblade.common.serviceConstant.ServiceConstant;
+import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.StringUtil;
+import org.springblade.system.cache.DictBizCache;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -142,8 +147,13 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 					}
 				});
 			}
-
-
+			//修改订单数据
+			if(distrilbutionBillLading.getStockArticleList().size() > 0){
+				boolean order = getOrder(distrilbutionBillLading.getStockArticleList(), distrilbutionBillLading.getId());
+				if(!order){
+					throw new ServiceException("修改失败！！");
+				}
+			}
 			//修改库存品
 			if (distrilbutionBillLading.getStockDTOList().size() > 0) {
 				//全部库存品数据
@@ -218,6 +228,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 					distrilbutionBillStock.setBillLadingId(distrilbutionBillLading.getId());
 					distrilbutionBillStock.setStockArticleId(Long.parseLong(s));
 					distrilbutionBillStock.setConditions("1");
+					distrilbutionBillStock.setOrderStatus("1");
 					distrilbutionBillStockService.save(distrilbutionBillStock);
 				}
 			}
@@ -261,6 +272,87 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 		return true;
 	}
 
+	/**
+	 * 修改操作订单数据
+	 * @param orderList
+	 * @return
+	 */
+	@Transactional(rollbackFor = Exception.class)
+	public boolean getOrder(List<DistributionStockArticleEntity> orderList,Long id){
+		//查询已有的数据
+		List<DistrilbutionBillStockEntity> list = distrilbutionBillStockService.list(Wrappers.<DistrilbutionBillStockEntity>query().lambda()
+			.eq(DistrilbutionBillStockEntity::getBillLadingId, id)
+			.eq(DistrilbutionBillStockEntity::getOrderStatus, "1")
+			.or(wp -> wp.eq(DistrilbutionBillStockEntity::getBillLadingId, id).eq(DistrilbutionBillStockEntity::getOrderStatus, "2"))
+		);
+		List<DistrilbutionBillStockEntity> deList = new ArrayList<>();
+		list.forEach( i ->{
+			boolean b = orderList.stream().anyMatch(o -> o.getId().equals(i.getStockArticleId()));
+			if(b){
+				//存在
+				Iterator<DistributionStockArticleEntity> iterator = orderList.iterator();
+				while (iterator.hasNext()){
+					DistributionStockArticleEntity next = iterator.next();
+					if(next.getId().equals( i.getStockArticleId())){
+						iterator.remove();
+					}
+				}
+			}else{
+				//不存在
+				DistrilbutionBillStockEntity stockEntity = new DistrilbutionBillStockVO();
+				stockEntity.setId(i.getId());
+				stockEntity.setOrderStatus(BillLadingStatusConstant.QX.getValue());
+				stockEntity.setConditions(i.getConditions());
+				stockEntity.setStockArticleId(i.getStockArticleId());
+				deList.add(stockEntity);
+			}
+
+		});
+		//删除提货订单状态
+		deList.forEach( i ->{
+			//查询数据是否已备货
+			if(!i.getConditions().equals("2")){
+				//未
+				List<DistributionStockEntity> list1 = distributionStockService.list(Wrappers.<DistributionStockEntity>query().lambda().eq(DistributionStockEntity::getStockArticle, i.getStockArticleId()));
+				if(list1.size() == 0){
+					//取消
+					DistributionStockArticleEntity stockArticleEntity = new DistributionStockArticleEntity();
+					stockArticleEntity.setId(i.getStockArticleId());
+					stockArticleEntity.setStockupStatus(StockupStatusConstant.weibeihuo.getValue());
+					stockArticleEntity.setReservationStatus(OrderReservationStatusConstant.daiyuyue.getValue());
+					distributionStockArticleService.updateById(stockArticleEntity);
+				}
+				distrilbutionBillStockService.updateById(i);
+			}
+		});
+		List<DistrilbutionBillStockEntity> list1 = new ArrayList<>();
+		//添加订单关联
+		orderList.forEach( i ->{
+			DistributionStockArticleEntity stockArticleEntity = new DistributionStockArticleEntity();
+			stockArticleEntity.setReservationStatus(OrderReservationStatusConstant.yiyueyue.getValue());
+			stockArticleEntity.setStockupStatus(StockupStatusConstant.daibeihuo.getValue());
+			stockArticleEntity.setId(i.getId());
+			distributionStockArticleService.updateById(stockArticleEntity);
+
+			DistrilbutionBillStockEntity distrilbutionBillStock = new DistrilbutionBillStockVO();
+			distrilbutionBillStock.setBillLadingId(id);
+			distrilbutionBillStock.setOrderStatus(BillLadingStatusConstant.TJ.getValue());
+			distrilbutionBillStock.setStockArticleId(i.getId());
+			distrilbutionBillStock.setConditions("1");
+			list1.add(distrilbutionBillStock);
+
+		});
+		distrilbutionBillStockService.saveBatch(list1);
+		//查询当前备货任务
+		DistrilbutionBillLadingEntity billLading = baseMapper.selectById(id);
+		if(billLading.getConditions().equals("5")){
+			//修改
+			billLading.setConsignee("4");
+			baseMapper.updateById(billLading);
+		}
+		return true;
+	};
+
 	@Override
 	public IPage<DistrilbutionBillLadingVO> pageList(IPage<Object> page, Map<String, Object> distrilbutionBillLading) {
 		DistrilbutionBillLadingDTO distrilbutionBillLadingDTO = JSONObject.parseObject(JSONObject.toJSONString(distrilbutionBillLading), DistrilbutionBillLadingDTO.class);
@@ -271,6 +363,9 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 			List<DistributionDeliveryChargeEntity> list = distributionDeliveryChargeService.list(Wrappers.<DistributionDeliveryChargeEntity>query().lambda()
 				.eq(DistributionDeliveryChargeEntity::getBillLading, i.getId())
 			);
+			list.forEach( ii ->{
+				ii.setCostName(DictBizCache.getValue(DictBizConstant.DELIVERY_COST,ii.getCost()));
+			});
 			i.setList(list);
 		});
 		distrilbutionBillLadingVOIPage.setRecords(records);
@@ -644,7 +739,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 	@Override
 	public DistrilbutionBillLadingDetailsVO getDetailOne(DistrilbutionBillLadingEntity distrilbutionBillLadingEntity) {
 		DistrilbutionBillLadingDetailsVO detailOne = baseMapper.getDetailOne(distrilbutionBillLadingEntity.getId());
-		List<DistributionParcelListEntity> list1 = new ArrayList<>();
+		List<DistributionStockArticleEntity> list1 = new ArrayList<>();
 		List<DistributionStockListVO> stockListEntities = new ArrayList<>();
 		//查询提货费用
 		List<DistributionDeliveryChargeEntity> list4 = distributionDeliveryChargeService.list(Wrappers.<DistributionDeliveryChargeEntity>query().lambda()
@@ -654,11 +749,13 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 		//查询提货信息
 		List<DistrilbutionBillStockEntity> list = distrilbutionBillStockService.list(Wrappers.<DistrilbutionBillStockEntity>query().lambda()
 			.eq(DistrilbutionBillStockEntity::getBillLadingId, distrilbutionBillLadingEntity.getId())
+			.eq(DistrilbutionBillStockEntity::getOrderStatus,"1")
+			.or( eq ->eq.eq(DistrilbutionBillStockEntity::getBillLadingId, distrilbutionBillLadingEntity.getId()).eq(DistrilbutionBillStockEntity::getOrderStatus,"2"))
 		);
 		list.forEach( i ->{
-			List<DistributionParcelListEntity> list2 = distributionParcelListService.list(Wrappers.<DistributionParcelListEntity>query().lambda().eq(DistributionParcelListEntity::getStockArticleId, i.getStockArticleId()));
+			List<DistributionStockArticleEntity> list2 = distributionStockArticleService.list(Wrappers.<DistributionStockArticleEntity>query().lambda().eq(DistributionStockArticleEntity::getId, i.getStockArticleId()));
 			if(list2.size() > 0){
-				list1.addAll(list2);
+				list1.addAll(DistributionStockArticleWrapper.build().listVO(list2));
 			}
 
 		});
@@ -889,5 +986,59 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 		return inventory;
 	}
 
+	/**
+	 * 签收
+	 * @param ids
+	 * @return
+	 */
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public Boolean updateOwn(String ids) {
+		String[] split = ids.split(",");
+		for (int i = 0; i < split.length; i++) {
+			String s = split[i];
+			//修改提货状态
+			DistrilbutionBillLadingEntity billLadingEntity = new DistrilbutionBillLadingEntity();
+			billLadingEntity.setConditions(BillLadingStatusConstant.YQS.getValue());
+			billLadingEntity.setId(Long.parseLong(s));
+			this.updateById(billLadingEntity);
+			//修改订单状态
+			List<DistrilbutionBillStockEntity> list = distrilbutionBillStockService.list(Wrappers.<DistrilbutionBillStockEntity>query().lambda()
+				.eq(DistrilbutionBillStockEntity::getBillLadingId, s)
+				.eq(DistrilbutionBillStockEntity::getOrderStatus, "1")
+				.or(ew -> ew.eq(DistrilbutionBillStockEntity::getBillLadingId, s).eq(DistrilbutionBillStockEntity::getOrderStatus, "2"))
+			);
+			if(list.size() > 0){
+				list.forEach( li ->{
+					DistributionStockArticleEntity stockArticleEntity = new DistributionStockArticleEntity();
+					stockArticleEntity.setOrderStatus(OrderStatusConstant.qianshou.getValue());
+					stockArticleEntity.setId(li.getStockArticleId());
+					distributionStockArticleService.updateById(stockArticleEntity);
+				});
+			}
+
+		}
+		return true;
+	}
+
+	@Override
+	public DistrilbutionBillLadingVO listNum(Map<String, Object> distrilbutionBillLading) {
+		DistrilbutionBillLadingDTO billLadingEntity = JSONObject.parseObject(JSONObject.toJSONString(distrilbutionBillLading), DistrilbutionBillLadingDTO.class);
+
+		DistrilbutionBillLadingVO billLadingVO =  baseMapper.getBillLadingNum(billLadingEntity); //查询
+
+		return billLadingVO;
+	}
+
+	/**
+	 * 查询详细信息
+	 * @param id
+	 * @return
+	 */
+	@Override
+	public List<DistrilbutionBillLadingViewVO> getViewDetailOwn(String id) {
+
+		return baseMapper.getViewDetailOwn(id);
+	}
 
 }

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

@@ -16,16 +16,25 @@
  */
 package com.logpm.distribution.service.impl;
 
+import cn.hutool.json.JSONObject;
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.logpm.distribution.entity.DistrilbutionBillStockEntity;
+import com.logpm.distribution.vo.DistributionBillOrderPackVO;
+import com.logpm.distribution.vo.DistributionBillOrderVO;
 import com.logpm.distribution.vo.DistrilbutionBillStockVO;
 import com.logpm.distribution.excel.DistrilbutionBillStockExcel;
 import com.logpm.distribution.mapper.DistrilbutionBillStockMapper;
 import com.logpm.distribution.service.IDistrilbutionBillStockService;
+import org.springblade.common.constant.DictBizConstant;
+import org.springblade.common.constant.stockup.StockupStatusConstant;
+import org.springblade.system.cache.DictBizCache;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 提货单订单信息关联 服务实现类
@@ -41,6 +50,25 @@ public class DistrilbutionBillStockServiceImpl extends BaseServiceImpl<Distrilbu
 		return page.setRecords(baseMapper.selectDistrilbutionBillStockPage(page, distrilbutionBillStock));
 	}
 
+	/**
+	 * 查询订单
+	 *
+	 * @param distrilbutionBillStock
+	 * @param page
+	 * @return
+	 */
+	@Override
+	public IPage<DistributionBillOrderVO> getBillOrderDetail(Map<String, Object> distrilbutionBillStock, IPage page) {
+		DistrilbutionBillStockEntity billStock = JSON.parseObject(JSON.toJSONString(distrilbutionBillStock), DistrilbutionBillStockEntity.class);
+		IPage<DistributionBillOrderVO> billOrderDetail = baseMapper.getBillOrderDetail(page, billStock);
+		billOrderDetail.getRecords().forEach( i ->{
+			if(StringUtils.isNotBlank(i.getStockupStatus())){
+				i.setStockupStatusName(DictBizCache.getValue(DictBizConstant.STOCKUP_STATUS,i.getStockupStatus()));
+			}
+		});
+		return billOrderDetail;
+	}
+
 
 	@Override
 	public List<DistrilbutionBillStockExcel> exportDistrilbutionBillStock(Wrapper<DistrilbutionBillStockEntity> queryWrapper) {
@@ -51,4 +79,10 @@ public class DistrilbutionBillStockServiceImpl extends BaseServiceImpl<Distrilbu
 		return distrilbutionBillStockList;
 	}
 
+	@Override
+	public IPage<DistributionBillOrderPackVO> getBillOrderPack(Map<String, Object> distrilbutionBillStock, IPage<Object> page) {
+		DistrilbutionBillStockEntity billStock = JSON.parseObject(JSON.toJSONString(distrilbutionBillStock), DistrilbutionBillStockEntity.class);
+		return baseMapper.getBillOrderPack(page,billStock);
+	}
+
 }