1.统计装车数量

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

@@ -16,12 +16,17 @@
  */
 package com.logpm.distribution.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.logpm.distribution.entity.DistributionReservationStockarticleEntity;
 import io.swagger.annotations.ApiModelProperty;
 import org.springblade.core.tool.node.INode;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.math.BigDecimal;
+import java.util.Date;
+
 /**
  * 预约订单中间表 视图实体类
  *
@@ -32,20 +37,186 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode(callSuper = true)
 public class DistributionReservationStockarticleVO extends DistributionReservationStockarticleEntity {
 	private static final long serialVersionUID = 1L;
+	/**
+	 * 物料名称
+	 */
+	@ApiModelProperty(value = "物料名称")
+	private String materialName;
+	/**
+	 * 已备货数量
+	 */
+	@ApiModelProperty(value = "已备货数量")
+	private String readyStock;
+	/**
+	 * 备货数量
+	 */
+	@ApiModelProperty(value = "备货数量")
+	private String deliveryNumber;
+	/**
+	 * 托盘
+	 */
+	@ApiModelProperty(value = "托盘")
+	private String pallet;
+	/**
+	 * 或为信息
+	 */
+	@ApiModelProperty(value = "或为信息")
+	private String goodsAllocation;
+	/**
+	 * 订单状态
+	 */
+	@ApiModelProperty(value = "订单状态")
+	private String stockArticleState;
+
 	/**
 	 * 订单自编号
 	 */
 	@ApiModelProperty(value = "订单自编号")
 	private String orderSelfNumbering;
+
+	/**
+	 * 门店id
+	 */
+	@ApiModelProperty(value = "门店id")
+	private Long storeId;
+
+
+	/**
+	 * 商场id
+	 */
+	@ApiModelProperty(value = "商场id")
+	private Long mallId;
+
+	/**
+	 * 商场名称
+	 */
+	@ApiModelProperty(value = "商场名称")
+	private String mallName;
+	/**
+	 * 商场编号
+	 */
+	@ApiModelProperty(value = "商场编码")
+	private String mallCode;
+
+
+	/**
+	 * 门店编号
+	 */
+	@ApiModelProperty(value = "门店编码")
+	private String storeCode;
+
+
+	/**
+	 * 门店名称
+	 */
+	@ApiModelProperty(value = "门店名称")
+	private String storeName;
+	/**
+	 * 货物名称
+	 */
+	@ApiModelProperty(value = "货物名称")
+	private String descriptionGoods;
+	/**
+	 * 仓库
+	 */
+	@ApiModelProperty(value = "仓库")
+	private String warehouse;
+	/**
+	 * 车次号
+	 */
+	@ApiModelProperty(value = "车次号")
+	private String trainNumber;
+
+
+	/**
+	 * 入库时间
+	 */
+	@ApiModelProperty(value = "入库时间")
+	@JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+	private Date warehouseEntryTime;
+	/**
+	 * 在库时间
+	 */
+	@ApiModelProperty(value = "在库时间")
+	private String storeTime;
+	/**
+	 * 订单总件数
+	 */
+	@ApiModelProperty(value = "订单总件数")
+	private Integer totalNumber;
+	/**
+	 * 在库件数
+	 */
+	@ApiModelProperty(value = "在库件数")
+	private Integer handQuantity;
+	/**
+	 * 是否齐套
+	 */
+	@ApiModelProperty(value = "是否齐套")
+	private Integer completeSet;
+	/**
+	 * 是否齐套名称
+	 */
+	@ApiModelProperty(value = "是否齐套名称")
+	@TableField(exist = false)
+	private String completeSetName;
+	/**
+	 * 品牌
+	 */
+	@ApiModelProperty(value = "品牌")
+	private String brand;
+	/**
+	 * 服务类型
+	 */
+	@ApiModelProperty(value = "服务类型")
+	private String typeService;
+	/**
+	 * 顾客名字
+	 */
+	@ApiModelProperty(value = "顾客名字")
+	private String customerName;
+	/**
+	 * 顾客电话
+	 */
+	@ApiModelProperty(value = "顾客电话")
+	private String customerTelephone;
+	/**
+	 * 顾客地址
+	 */
+	@ApiModelProperty(value = "顾客地址")
+	private String customerAddress;
+	/**
+	 * 类型;1 预约单  2库存单
+	 */
+	@ApiModelProperty(value = "类型;1 预约单  2库存单")
+	private Integer genre;
+
+
+	/**
+	 * 状态;1 已通知 2 未通知
+	 */
+	@ApiModelProperty(value = "状态;1 已通知 2 未通知")
+	private Integer notification;
+
+	/**
+	 * 增值服务总费用
+	 */
+	@ApiModelProperty(value = "增值服务总费用")
+	private BigDecimal fee;
+
+	/**
+	 * 协商费用
+	 */
+	@ApiModelProperty(value = "协商费用")
+	private BigDecimal rate;
+
+
+
 	/**
 	 * 运单号
 	 */
 	@ApiModelProperty(value = "运单号")
 	private String waybillNumber;
-	/**
-	 * 数量
-	 */
-	@ApiModelProperty(value = "数量")
-	private Integer signinQuantity;
+
 
 }

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

@@ -121,7 +121,7 @@ public class DistributionDeliveryListController extends BladeController {
 	 */
 	@GetMapping("/order")
 	@ApiOperationSupport(order = 1)
-	@ApiOperation(value = "查看包件详情", notes = "传入distributionDeliveryList")
+	@ApiOperation(value = "查看订单", notes = "传入distributionDeliveryList")
 	public R<IPage<DistributionStockArticleVO>> order(DistributionDeliveryInfoDTO distributionDeliveryInfoDTO, Query query) {
 		IPage<DistributionStockArticleVO> pages = distributionDeliveryInfoService.selectDistributionDeliveryorder(Condition.getPage(query), distributionDeliveryInfoDTO);
 		return R.data(pages);

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

@@ -85,7 +85,7 @@ public class DistrilbutionloadingscanDTO {
 	/**
 	 * 库存品扫描物品
 	 */
-	@ApiModelProperty(value = "扫描物品(1-手动输入,2-托盘)")
+	@ApiModelProperty(value = "扫描物品(1-手动输入,2-托盘,3-扫描)")
 //	@NotEmpty(message = "扫描物品不能为空")
 	private Integer inventorytype;
 	/**

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

@@ -108,7 +108,14 @@
         JOIN logpm_distribution_delivery_list lddl on  lddl.id = lds.delivery_id
         join logpm_distribution_parcel_list ldpl on ldrp.parce_list_id = ldpl.id
         <where>
-             lds.is_deleted =0 and lds.reservation_id = #{param.reservationId}
+            lds.is_deleted =0
+            <if test="param.reservationId != null and param.reservationId!=''">
+                and lds.reservation_id = #{param.reservationId}
+            </if>
+               <if test="param.orderId != null and param.orderId!=''">
+                and ldrs.stock_article_id = #{param.orderId}
+            </if>
+
         </where>
     </select>
     <select id="selectWrapCount" resultType="java.lang.Integer">
@@ -162,7 +169,33 @@
         </where>
     </select>
     <select id="selectDistributionDeliveryinventoryPage" resultType="com.logpm.distribution.vo.DistributionStockListVO">
-
+        ldsl.sku sku,
+        ldsl.order_self_numbering orderSelfNumbering,
+        ldsl.description_goods descriptionGoods,
+        ldsl.unit unit,
+        ( SELECT
+        count(*)
+        FROM
+        logpm_distribution_reservation_stocklist ldrsl
+        WHERE
+        ldrsl.reservation_id = lds.reservation_id) deliveryNumber,
+        (
+        SELECT
+        count(*)
+        FROM
+        logpm_distribution_reservation_stocklist ldrsl
+        WHERE
+        ldrsl.reservation_id = lds.reservation_id
+        ) readyStock
+        FROM
+        logpm_distribution_reservation_stocklist ldrsl
+        JOIN logpm_distribution_signfor lds on lds.reservation_id = ldrsl.reservation_id
+        join logpm_distribution_reservation_stockarticle ldrs on lds.reservation_id = ldrs.reservation_id
+        JOIN logpm_distribution_delivery_list lddl on  lddl.id = lds.delivery_id
+        join logpm_distribution_stock_list ldsl on ldrsl.stocklist_id = ldsl.id
+        <where>
+            lds.is_deleted =0 and lddl.id = #{param.deliveryId}
+        </where>
     </select>
     <select id="selectDistributionDeliveryOrderPage" resultType="com.logpm.distribution.vo.DistributionStockArticleVO">
         SELECT

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

@@ -160,4 +160,10 @@ public interface DistributionDeliveryListMapper extends BaseMapper<DistributionD
 	 * @return
 	 */
 	List<DistributionLoadscaninvnVO> selectdeliverOnevn(Long reservationId, Long deliveryId);
+	/**
+	 * 通过配送任务库存品扫描
+	 *
+	 * @return
+	 */
+	List<DistributionLoadscaninvnEntity> selectdeliveryworkVnScan(String barcode, Long deliveryId);
 }

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

@@ -165,7 +165,7 @@
         </where>
     </select>
     <select id="selectcommercialTotal" resultType="java.lang.Integer">
-        SELECT COALESCE (lddl.delivery_number,0)
+        SELECT COALESCE (sum(lddl.delivery_number) ,0)
         FROM
         logpm_distribution_delivery_list lddl
         <where>
@@ -241,7 +241,7 @@
     </select>
     <select id="selectmarketTotal" resultType="java.lang.Integer">
         SELECT COALESCE
-        (lddl.delivery_number, 0 )
+        (sum(lddl.delivery_number), 0 )
         FROM
         logpm_distribution_delivery_list lddl
         <where>
@@ -466,4 +466,7 @@
         WHERE
             lds.is_deleted = 0 and lddl.id = #{deliveryId} and   ldsl.id =#{inventoryId}
     </select>
+    <select id="selectdeliveryworkVnScan" resultType="com.logpm.distribution.entity.DistributionLoadscaninvnEntity">
+
+    </select>
 </mapper>

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

@@ -38,28 +38,83 @@
     </select>
     <select id="selectDistributionReservationStockarticleorderPage" resultType="com.logpm.distribution.vo.DistributionReservationStockarticleVO">
         SELECT
+        distinct ldsa.order_self_numbering orderSelfNumbering,
         ldrs.id id,
         ldsa.id stockArticleId,
-            ldsa.order_self_numbering orderSelfNumbering,
-            ldsa.waybill_number waybillNumber,
-            (CASE
-                 WHEN ldrs.is_have_data = 2 THEN
-                     (SELECT COALESCE(SUM(ldl.received_quantity), 0) from logpm_distribution_loadscan ldl WHERE ldl.order_id =ldsa.id)
-                 WHEN ldrs.is_have_data = 1 THEN
-                     ldrs.reservation_num
-                END ) signinQuantity
+        ldsa.description_goods descriptionGoods,
+        (
+        SELECT
+        GROUP_CONCAT( ldpl.material_name SEPARATOR ',' )
+        FROM
+        logpm_distribution_parcel_list ldpl
+        JOIN logpm_distribution_reservation_package ldrp ON ldrp.parce_list_id = ldpl.id
+        WHERE
+        ldrp.reservation_id = lds.reservation_id
+        ) materialName,
+        lddl.delivery_number deliveryNumber,
+        (
+        SELECT
+        count(*)
+        FROM
+        logpm_distribution_reservation_package ldrp
+        WHERE
+        ldrp.reservation_id = lds.reservation_id and ldrp.packet_bar_state = 3
+        ) readyStock,
+        (
+        SELECT
+        GROUP_CONCAT( ldpl.pallet SEPARATOR ',' )
         FROM
-            logpm_distribution_reservation_stockarticle ldrs
+        logpm_distribution_parcel_list ldpl
+        JOIN logpm_distribution_reservation_package ldrp ON ldrp.parce_list_id = ldpl.id
+        WHERE
+        ldrp.reservation_id = lds.reservation_id
+        ) pallet,
+        (
+        SELECT
+        GROUP_CONCAT( ldpl.goods_allocation SEPARATOR ',' )
+        FROM
+        logpm_distribution_parcel_list ldpl
+        JOIN logpm_distribution_reservation_package ldrp ON ldrp.parce_list_id = ldpl.id
+        WHERE
+        ldrp.reservation_id = lds.reservation_id
+        ) goodsAllocation,
+        ldrs.stock_article_state stockArticleState
+        FROM
+        logpm_distribution_signfor lds
+        JOIN logpm_distribution_reservation_stockarticle ldrs ON lds.reservation_id = ldrs.reservation_id
+        JOIN logpm_distribution_delivery_list lddl ON lddl.id = lds.delivery_id
         JOIN logpm_distribution_stock_article ldsa ON ldrs.stock_article_id = ldsa.id
     <where>
         <if test="param.orderSelfNumbering != null and param.orderSelfNumbering!=''">
             and ldsa.order_self_numbering like concat('%', #{param.orderSelfNumbering},'%')
         </if>
-        <if test="param.waybillNumber != null and param.waybillNumber!=''">
-            and  ldsa.waybill_number like concat('%',#{param.waybillNumber},'%')
-        </if>
         and  ldrs.reservation_id = #{param.reservationId}
     </where>
 </select>
+<!-- <select id="selectDistributionReservationStockarticleorderPage" resultType="com.logpm.distribution.vo.DistributionReservationStockarticleVO">&ndash;&gt;-->
+<!--        SELECT-->
+<!--            ldrs.id id,-->
+<!--            ldsa.id stockArticleId,-->
+<!--            ldsa.order_self_numbering orderSelfNumbering,-->
+<!--            ldsa.waybill_number waybillNumber,-->
+<!--            (CASE-->
+<!--                 WHEN ldrs.is_have_data = 2 THEN-->
+<!--                     (SELECT COALESCE(SUM(ldl.received_quantity), 0) from logpm_distribution_loadscan ldl WHERE ldl.order_id =ldsa.id)-->
+<!--                 WHEN ldrs.is_have_data = 1 THEN-->
+<!--                     ldrs.reservation_num-->
+<!--                END ) signinQuantity-->
+<!--        FROM-->
+<!--            logpm_distribution_reservation_stockarticle ldrs-->
+<!--        JOIN logpm_distribution_stock_article ldsa ON ldrs.stock_article_id = ldsa.id-->
+<!--    <where>-->
+<!--        <if test="param.orderSelfNumbering != null and param.orderSelfNumbering!=''">-->
+<!--            and ldsa.order_self_numbering like concat('%', #{param.orderSelfNumbering},'%')-->
+<!--        </if>-->
+<!--        <if test="param.waybillNumber != null and param.waybillNumber!=''">-->
+<!--            and  ldsa.waybill_number like concat('%',#{param.waybillNumber},'%')-->
+<!--        </if>-->
+<!--        and  ldrs.reservation_id = #{param.reservationId}-->
+<!--    </where>-->
+<!--    </select>-->
 
 </mapper>

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

@@ -462,6 +462,9 @@
             ldr.delivery_address deliveryAddress,
             ldr.delivery_phone deliveryPhone,
             lds.reservation_id reservationId,
+            lds.signing_type signingType,
+            lds.clerk_sign_pictures clerkSignPictures,
+            lds.delivery_sign_pictures deliverySignPictures,
             ldr.reservation_date reservationDate,
             CASE
 

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

@@ -624,7 +624,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		List<DistributionLoadscanEntity> distributionLoadscanEntities = baseMapper.selectdeliverOne(distrilbutionloadingscanDTO.getReservationId(), distrilbutionloadingscanDTO.getDeliveryId());
 		//无数据的
 	//	List<DistributionLoadscanEntity> distributionLoadscanEntitiesno = baseMapper.selectdeliverOneNo(distrilbutionloadingscanDTO.getReservationId(), distrilbutionloadingscanDTO.getDeliveryId());
-		//查询库存品
+		//查询所有的库存品
 		List<DistributionLoadscaninvnVO> distributionLoadscanvnEntities = baseMapper.selectdeliverOnevn(distrilbutionloadingscanDTO.getReservationId(), distrilbutionloadingscanDTO.getDeliveryId());
 		//将该客户所有的物品上该车辆
 		if (distributionLoadscanEntities.size() > 0) {
@@ -815,17 +815,19 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			DistributionDeliveryTripartiteEntity distributionDeliveryTripartiteEntity = distributionDeliveryTripartiteMapper.selectById(distrilbutionloadingscanDTO.getLoadingId());
 			BeanUtils.copyProperties(distributionDeliveryTripartiteEntity,distributionDeliverySelfEntity);
 		}
-		List<DistributionLoadscaninvnEntity> distributionLoadscanvnEntities = baseMapper.selectdeliveryworkVnId(distrilbutionloadingscanDTO.getInventoryId(), distrilbutionloadingscanDTO.getDeliveryId());
+		boolean b =false;
+		if (distrilbutionloadingscanDTO.getInventorytype()==3){
+			List<DistributionLoadscaninvnEntity> distributionLoadscanvnEntities = baseMapper.selectdeliveryworkVnScan(distrilbutionloadingscanDTO.getBarcode(), distrilbutionloadingscanDTO.getDeliveryId());
 			if (distributionLoadscanvnEntities.size() <= 0) {
 				return R.fail(3001, "窜货");
 			}
 			for (DistributionLoadscaninvnEntity distributionLoadscanEntity : distributionLoadscanvnEntities) {
 				//查询是否重复扫码
-			List<DistributionLoadscanEntity> distributionLoadscanEntitiesflag = distributionLoadscanMapper.selectList(new QueryWrapper<DistributionLoadscanEntity>().lambda()
-				.eq(DistributionLoadscanEntity::getDeliveryId, distributionLoadscanEntity.getReservationId())
-				.eq(DistributionLoadscanEntity::getPacketBarCode, distributionLoadscanEntity.getPacketBarCode())
-				.ne(DistributionLoadscanEntity::getScanStatus, 1)
-			);
+//			List<DistributionLoadscanEntity> distributionLoadscanEntitiesflag = distributionLoadscanMapper.selectList(new QueryWrapper<DistributionLoadscanEntity>().lambda()
+//				.eq(DistributionLoadscanEntity::getDeliveryId, distributionLoadscanEntity.getReservationId())
+//				.eq(DistributionLoadscanEntity::getPacketBarCode, distributionLoadscanEntity.getPacketBarCode())
+//				.ne(DistributionLoadscanEntity::getScanStatus, 1)
+//			);
 //			if (distributionLoadscanEntitiesflag.size() > 0) {
 //				return R.fail(3002, "重复货物");
 //			}
@@ -850,7 +852,10 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 				Integer j = distributionSignforMapper.updateloadByReservationId(distributionLoadscanEntity.getReservationId(), distrilbutionloadingscanDTO.getInventoryNub());
 
 			}
-		boolean b = distributionLoadscaninvnService.saveBatch(distributionLoadscanvnEntities);
+			 b = distributionLoadscaninvnService.saveBatch(distributionLoadscanvnEntities);
+		}
+
+
 		return R.status(b);
 	}