自提维护商品信息、车次号字段

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

@@ -273,6 +273,8 @@
         lddl.distribution_company ,
         lddl.delivery_status ,
         lddl.delivery_list_loading_status
+        ORDER BY
+        lddl.create_time DESC
 
     </select>
     <select id="selectdeliverOnevnopen" resultType="com.logpm.distribution.entity.DistributionLoadscaninvnEntity">

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

@@ -56,7 +56,22 @@
         from  logpm_distribution_bill_lading_scan
         where bill_lading_id = dbl.id
         ) stopNum,
-        GROUP_CONCAT(DISTINCT dsa.order_code) orderCode
+        GROUP_CONCAT(DISTINCT dsa.order_code) orderCode,
+        (SELECT
+        GROUP_CONCAT(splice)
+        from
+        (
+        SELECT dbl2.id as id,
+        if(ldpl2.second=null or ldpl2.second='' ,'',CONCAT(ldpl2.second,'(',count(*),')') )
+        as splice from  logpm_distrilbution_bill_lading dbl2
+        LEFT JOIN logpm_distrilbution_bill_package dbp2 ON dbp2.bill_lading_id = dbl2.id AND dbp2.packet_bar_status IN ( 1, 3 )
+        LEFT JOIN logpm_distribution_parcel_list ldpl2 ON dbp2.parce_list_id = ldpl2.id
+        AND dbp2.tenant_id = '627683'
+        GROUP BY dbl2.pickup_batch,ldpl2.second
+        ) as aimdate
+        WHERE dbl.id=id
+        GROUP BY id
+        ) AS productInformation
         from logpm_distrilbution_bill_lading dbl
         LEFT JOIN logpm_distrilbution_bill_package dbp on dbp.bill_lading_id = dbl.id and dbp.packet_bar_status in (1,3)
         LEFT JOIN logpm_distribution_stock_article dsa on dbp.stock_article_id = dsa.id

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

@@ -135,12 +135,12 @@
         from logpm_distribution_parcel_list ldpl
         LEFT JOIN logpm_warehouse_tray_goods lwtg on lwtg.association_id = ldpl.id and lwtg.association_type = '3'
         where  ldpl.stock_article_id = ldbs.stock_article_id) pallet ,
-        (select COALESCE(GROUP_CONCAT(DISTINCT lwug.allocation_title SEPARATOR ','), '')
+        (select COALESCE(GROUP_CONCAT(DISTINCT lwga.qr_code SEPARATOR ','), '')
         from logpm_distribution_parcel_list ldpl
         LEFT JOIN logpm_warehouse_updown_goods lwug on lwug.association_id = ldpl.id and lwug.association_type = '3'
+        LEFT JOIN logpm_warehouse_goods_allocation AS lwga ON lwug.allocation_id = lwga.id
         where ldpl.stock_article_id = ldbs.stock_article_id)  goodsAllocation,
         ldsa.service_number serviceNumber,ldsa.waybill_number waybillNumber,ldsa.train_number trainNumber,ldsa.send_warehouse_name sendWarehouseName
-
         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
@@ -156,10 +156,11 @@
         ldpl.order_package_code orderPackageCode,
         ldpl.warehouse,
         ldpl.firsts,
-        ldpl.SECOND,
+        ldpl.SECOND AS `second`,
         ldpl.third_product thirdProduct,
         ldpl.material_code materialCode,
         ldpl.material_name materialName,
+        ldpl.train_number trainNumber,
         ldpl.waybill_number waybillNumber,
         ldpl.send_warehouse_name sendWarehouseName,
         ldpl.order_code orderCode,

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

@@ -795,7 +795,6 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 	@Override
 	public R searchNode(Integer searchType, String searchCode) {
 		List<DeliveryNodeVo> nodeVos = null;
-
 		switch (searchType) {
 			case 1:
 				//配送单查询

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

@@ -106,7 +106,6 @@ public class WarehouseUpdownStockupAreaApiController {
 			log.error(method+"系统异常，联系管理员",e);
 			return R.fail(500,"系统异常，联系管理员");
 		}
-
 	}
 
 

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseUpdownStockupAreaService.java

@@ -61,7 +61,7 @@ public interface IWarehouseUpdownStockupAreaService extends BaseService<Warehous
 	/**
 	 * 备货库位扫描
 	 * @param allocationId
-	 * @param id
+	 * @param warehouseId
 	 * @return
 	 */
 	UpShelfAllocationVO upShelfScanAllocation(Long allocationId, Long warehouseId);

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

@@ -303,6 +303,17 @@ public class WarehouseUpdownStockupAreaServiceImpl extends BaseServiceImpl<Wareh
 		upShelfAllocationVO.setShelfTitle(goodsShelfName);
 		upShelfAllocationVO.setAllocationId(allocationId);
 		upShelfAllocationVO.setAllocationTitle(goodsAllocationName);
+
+
+
+
+
+
+
+
+
+
+
 		return upShelfAllocationVO;
 	}
 }