Merge branch 'dev' of http://47.108.105.48:3000/java_project/logisticsplatform-service into dev

blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseScanRecordVO.java

@@ -52,7 +52,7 @@ public class WarehouseScanRecordVO extends WarehouseScanRecordEntity {
 	 * 二级扫描类型(扫描详情)
 	 */
 	@ApiModelProperty(value = "扫描详情")
-	private Date date;
+	private String date;
 
 
 	/**

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

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 
@@ -85,5 +86,11 @@ public class DistributionDeliveryAllocationDTO {
 	@ApiModelProperty(value = "任务时间")
 	private String remarks;
 
+	/**
+	 * 费用
+	 */
+	@ApiModelProperty(value = "费用")
+	private BigDecimal price;
+
 
 }

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

@@ -511,12 +511,13 @@
         select DISTINCT ldsi.stockup_id , ldpl.id id,ldpl.order_package_code orderPackageCode,lds.type
         stockupStatus,ldpl.firsts,ldpl.second,ldpl.third_product thirdProduct,
         ldpl.material_name materialName,lds.create_time stockupDate,lds.stockup_area stockupArea,ldpl.goods_allocation
-        goodsAllocation,lwtg.tray_code pallet
+        goodsAllocation,lwt.pallet_name pallet
         from logpm_distribution_stockup_info ldsi
         LEFT JOIN logpm_distribution_reservation_package ldrp on ldrp.reservation_id = ldsi.reservation_id
         LEFT JOIN logpm_distribution_parcel_list ldpl on ldpl.id = ldrp.parce_list_id
         LEFT JOIN logpm_distribution_stock lds on ldpl.id = lds.parcel_list_id and lds.stockup_id = ldsi.stockup_id
         LEFT JOIN logpm_warehouse_tray_goods lwtg on lwtg.association_id = ldpl.id and lwtg.association_type = '3'
+        LEFT JOIN logpm_warehouse_tray lwt on lwtg.tray_id = lwt.id
         <where>
             ldsi.stockup_id =#{id} and ldpl.order_package_code is not null
         </where>
@@ -612,11 +613,13 @@
         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,
+        ldpl.order_package_delivery_status,
+<!--        lwtg.pallet_name AS pallet,-->
+        GROUP_CONCAT(DISTINCT lwt.pallet_name) 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_tray lwt on lwtg.tray_id = lwt.id
         LEFT JOIN logpm_warehouse_updown_goods lwug on lwug.association_id = ldpl.id
         <where>
             ldpl.conditions in ('1','3')

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

@@ -474,6 +474,9 @@
             <if test="  param.warehouseEntryTime != null  ">and DATE(ldsa.warehouse_entry_time) =
                 #{param.warehouseEntryTime}
             </if>
+            <if test="  param.warehouseEntryTimeEnd != null  ">and DATE(ldsa.warehouse_entry_time) =
+                #{param.warehouseEntryTimeEnd}
+            </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},'%')
@@ -522,7 +525,7 @@
             <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
+            <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
@@ -606,7 +609,7 @@
         <where>
             ldsa.order_status in ('10','20','30','70')
             and ldsa.reservation_status in ('10','20')
-            AND (ldsa.incoming_num - ldsa.delivery_quantity) > 0
+            AND (ldsa.incoming_num - ldsa.delivery_quantity) > 0 AND  ldsa.hand_quantity > 0
             <if test="par.warehouseId != null and par.warehouseId != '' ">
                 and ldsa.warehouse_id = #{par.warehouseId}
             </if>

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

@@ -236,7 +236,7 @@
         fixTime,lds.assign_time assignTime,
         lds.type_service typeService,lds.outbound_date outboundDate,lds.stockup_code stockupCode,
         COALESCE(GROUP_CONCAT(DISTINCT lwug.position_code SEPARATOR ','), '') stockipAllocation,
-        COALESCE(GROUP_CONCAT(DISTINCT lwtg.tray_code SEPARATOR ','), '') pallet,
+        COALESCE(GROUP_CONCAT(DISTINCT lwt.pallet_name SEPARATOR ','), '') pallet,
         COALESCE ( group_concat( DISTINCT ldr.consignee SEPARATOR ',' ), '' ) AS consignee
         from logpm_distribution_stockup lds
         LEFT JOIN logpm_distribution_stockup_info ldsi on ldsi.stockup_id =lds.id
@@ -244,12 +244,13 @@
         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_warehouse_tray_goods lwtg on lwtg.association_id = ldrp.parce_list_id
+        LEFT JOIN logpm_warehouse_tray lwt on lwtg.tray_id = lwt.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.consignee != null and param.consignee != '' ">and
+            <if test="param.consignee != null and param.consignee != '' "> and
             ldr.consignee = #{param.consignee}
             </if>
             <if test="param.stockupDate != null  ">and TO_DAYS(lds.stockup_date)=TO_DAYS( #{param.stockupDate})</if>

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

@@ -526,12 +526,22 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 					DistributionStockArticleEntity stockArticleEntity = distributionStockArticleMapper.selectById(oo);                        //修改
 					stockArticleEntity.setId(oo);
 					stockArticleEntity.setGenre(2);
-					stockArticleEntity.setTotalNumber(stockArticleEntity.getTotalNumber() - list1.size());
+//					stockArticleEntity.setTotalNumber(stockArticleEntity.getTotalNumber() - list1.size());
+					stockArticleEntity.setHandQuantity(0);
 					distributionStockArticleMapper.updateById(stockArticleEntity);
 				} else {
 					DistributionStockArticleEntity distributionStockArticleEntity = distributionStockArticleMapper.selectById(oo);
 					distributionStockArticleEntity.setHandQuantity(distributionStockArticleEntity.getHandQuantity() - list1.size());
-					distributionStockArticleEntity.setTotalNumber(distributionStockArticleEntity.getTotalNumber() - list1.size());
+//					distributionStockArticleEntity.setTotalNumber(distributionStockArticleEntity.getTotalNumber() - list1.size());
+					//统计订单在库数量
+//					List<DistributionParcelListEntity> parcelListEntities = this.list(Wrappers.<DistributionParcelListEntity>query().lambda()
+//						.eq(DistributionParcelListEntity::getStockArticleId, oo)
+//						.eq(DistributionParcelListEntity::getWarehouseId, myCurrentWarehouse.getId())
+//					);
+//					int sum = parcelListEntities.stream().filter(p -> "1".equals(p.getConditions())).mapToInt(DistributionParcelListEntity::getQuantity).sum();
+//					distributionStockArticleEntity.setHandQuantity(sum);
+//					distributionStockArticleEntity.setIncomingNum(sum);
+
 					distributionStockArticleMapper.updateById(distributionStockArticleEntity);
 				}
 			});

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

@@ -2408,6 +2408,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 			distributionDeliveryListEntity.setLoadingTeamName(stockup.getLoaderName());
 		}
 		distributionDeliveryListEntity.setWarehouseName(String.join(",", deliveryWarehouseName));
+		distributionDeliveryListEntity.setPrice(allocationDTO.getPrice());
 //		distributionDeliveryListEntity.setOrderCode(String.join(",", orderNumber));
 		distributionDeliveryListEntity.setOrderNumber(orderTotal.get());
 		distributionDeliveryListEntity.setDeliveryNumber(deliveryPackageTotal.get());

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseStockMapper.xml

@@ -103,7 +103,6 @@
         '取消装车' AS `scanNodeType`,
         '配送' AS `nodeName`
         FROM
-
         `logpm_distribution_parcel_list` `ldpl`
         JOIN `logpm_distribution_loadscan` `ldl` ON
         `ldpl`.`id` = `ldl`.`package_id`
@@ -143,8 +142,8 @@
             <if test="param.thirdProduct != null and param.thirdProduct != '' ">
                 and ldpl.third_product like concat('%',#{param.thirdProduct},'%')
             </if>
-            <if test="param.date != null  ">
-                and ldl.update_time like concat(#{param.date},'%')
+            <if test="param.date != null ">
+                and DATE(ldpl.warehouse_entry_time_end)= #{param.date}
             </if>
         </where>
         UNION ALL
@@ -245,7 +244,7 @@
                 and ldpl.third_product like concat('%',#{param.thirdProduct},'%')
             </if>
             <if test="param.date != null  ">
-                and ldl.create_time like concat(#{param.date},'%')
+                and DATE(ldl.create_time) = #{param.date}
             </if>
         </where>
         UNION ALL
@@ -346,7 +345,7 @@
                 and ldpl.third_product like concat('%',#{param.thirdProduct},'%')
             </if>
             <if test="param.date != null  ">
-                and ldl.update_time like concat(#{param.date},'%')
+                and DATE(ldl.update_time) = #{param.date}
             </if>
         </where>
         UNION ALL
@@ -406,7 +405,6 @@
         `lds`.`create_time` AS `operatorTime`,
         `lds`.`create_user` AS `operatorId`,(
         CASE
-
         WHEN ( `lds`.`conditions` = 1 ) THEN
         '配送备货'
         WHEN ( `lds`.`conditions` = 2 ) THEN
@@ -453,7 +451,7 @@
                 and ldpl.third_product like concat('%',#{param.thirdProduct},'%')
             </if>
             <if test="param.date != null  ">
-                and lds.create_time like concat(#{param.date},'%')
+                and DATE(lds.create_time) =#{param.date}
             </if>
         </where>
         UNION ALL
@@ -553,7 +551,7 @@
                 and ldpl.third_product like concat('%',#{param.thirdProduct},'%')
             </if>
             <if test="param.date != null  ">
-                and lwug.create_time like concat(#{param.date},'%')
+                and DATE(lwug.create_time) =#{param.date}
             </if>
         </where>
         UNION ALL
@@ -653,7 +651,7 @@
                 and ldpl.third_product like concat('%',#{param.thirdProduct},'%')
             </if>
             <if test="param.date != null  ">
-                and lwtg.create_time like concat(#{param.date},'%')
+                and DATE(lwtg.create_time) =#{param.date}
             </if>
         </where>
 

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseStockServiceImpl.java

@@ -67,7 +67,6 @@ public class WarehouseStockServiceImpl extends BaseServiceImpl<WarehouseStockMap
 		warehouseScanRecordVO.setWarehouseIdList(this.loginPerson());
 		BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse();
 
-		try {
 			if (Func.isEmpty(myCurrentWarehouse)){
 				return null;
 			}
@@ -76,12 +75,8 @@ public class WarehouseStockServiceImpl extends BaseServiceImpl<WarehouseStockMap
 				return null;
 			}
 			String operatorTime = warehouseScanRecordVO.getOperatorTime();
-			SimpleDateFormat sf = new SimpleDateFormat(DateUtil.PATTERN_DATE);
-			Date parse = sf.parse(operatorTime);
-			warehouseScanRecordVO.setDate(parse);
-		} catch (ParseException e) {
-			throw new RuntimeException(e);
-		}
+			warehouseScanRecordVO.setDate(operatorTime);
+
 		List<WarehouseScanRecordVO> result = new ArrayList<>();
 		warehouseScanRecordVO.setWarehouseId(myCurrentWarehouse.getId());
 		List<WarehouseScanRecordVO> warehouseScanRecordVOS = baseMapper.selectWarehouseStockPage(page, warehouseScanRecordVO);