Merge branch 'dev' into pre-production

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

@@ -390,8 +390,9 @@
 
     <select id="listAllocationOrder" resultType="com.logpm.distribution.vo.DistributionStockListAllocationVO">
         select lwug.position_code allocationTitle,
+        lwug.allocation_id,
         ldsi.market_name marketName,
-        lwug.num,
+        sum(lwug.num) num,
         lwug.create_time createTime,
         ldsi.cargo_unit cargoUnit,
         ldsi.unpack,
@@ -402,10 +403,11 @@
         logpm_distribution_stock_list ldsi
         left join logpm_distribution_stock_list_info ldsli on ldsli.material_id = ldsi.material_id AND ldsli.warehouse_id = ldsi.warehouse_id
         AND ldsi.market_id = ldsli.market_id and ldsli.incoming_batch = ldsi.incoming_batch
-        LEFT JOIN logpm_warehouse_updown_goods lwug ON ldsli.parcel_list_id = lwug.association_id and lwug.association_type = '4'
+        LEFT JOIN logpm_warehouse_updown_goods lwug ON ldsli.parcel_list_id = lwug.association_id and lwug.association_type = '3'
         <where>
             <if test="param.id != null "> and  ldsi.id = #{param.id}</if>
         </where>
+        group by lwug.allocation_id
     </select>
 
 

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

@@ -219,7 +219,6 @@ public class DistributionStockListServiceImpl extends BaseServiceImpl<Distributi
 	/**
 	 *
 	 * @param distributionStockListDTO
-	 * @return
 	 */
 	@Override
 	@Transactional(rollbackFor = Exception.class)
@@ -296,6 +295,7 @@ public class DistributionStockListServiceImpl extends BaseServiceImpl<Distributi
 		stockListEntity.setUnpackingQuantity( list.get(0).getUnpackingQuantity() + distributionStockListDTO.getUnpackingQuantity());
 		this.updateById(stockListEntity);
 
+
 		//添加拆包记录
 		DistributionUnpackingDetailsEntity distributionUnpackingDetails= new DistributionUnpackingDetailsEntity();
 		distributionUnpackingDetails.setStockArticleId(Optional.ofNullable(list.get(0).getStockArticleId()).orElse(null));