Merge remote-tracking branch 'origin/dev' into pre-production

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

@@ -381,11 +381,24 @@
           and ldsl.warehouse_id = #{warehouseId}
     </select>
     <select id="listAllocation" resultType="com.logpm.distribution.vo.DistributionStockListAllocationVO">
-        select lwug.position_code allocationTitle,ldsi.market_name marketName,lwug.num,lwug.create_time createTime,ldsi.cargo_unit cargoUnit,
-        ldsi.unpack,ldsi.quantity_stock quantityStock,ldsi.unpacking_quantity unpackingQuantity,ldsi.description_goods descriptionGoods
-        from logpm_distribution_stock_list ldsi
-        LEFT JOIN logpm_warehouse_updown_goods lwug on ldsi.material_id = lwug.association_id and ldsi.incoming_batch = lwug.incoming_batch
-        and ldsi.market_id = lwug.market_id and lwug.association_type = '4' and lwug.warehouse_id = ldsi.warehouse_id
+        SELECT
+        lwga.qr_code allocationTitle,
+        ldsi.market_name marketName,
+        lwug.num,
+        lwug.create_time createTime,
+        ldsi.cargo_unit cargoUnit,
+        ldsi.unpack,
+        ldsi.quantity_stock quantityStock,
+        ldsi.unpacking_quantity unpackingQuantity,
+        ldsi.description_goods descriptionGoods
+        FROM
+        logpm_distribution_stock_list ldsi
+        LEFT JOIN logpm_warehouse_updown_goods lwug ON ldsi.material_id = lwug.association_id
+        LEFT JOIN logpm_warehouse_goods_allocation AS lwga ON lwug.allocation_id = lwga.id
+        AND ldsi.incoming_batch = lwug.incoming_batch
+        AND ldsi.market_id = lwug.market_id
+        AND lwug.association_type = '4'
+        AND lwug.warehouse_id = ldsi.warehouse_id
         <where>
             lwug.id is not null
             <if test="param.materialId != null and param.materialId != '' "> and  ldsi.material_id = #{param.materialId}</if>

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

@@ -53,8 +53,8 @@ public class WarehouseConfigServiceImpl extends BaseServiceImpl<WarehouseConfigM
 			this.updateById(warehouseConfigEntity);
 			//关闭配置进行默认库位的清理
 			warehouseConfigEntity.setDefaultAllocation("");
-			this.updateById(warehouseConfigEntity);
-			return R.status(flag);
+
+			return R.status(this.updateById(warehouseConfigEntity));
 		}
 
 		return R.fail("未知错误!!!");

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

@@ -435,7 +435,6 @@ public class WarehouseWarehousingEntryServiceImpl extends BaseServiceImpl<Wareho
 				} else {
 					//进行打托操作
 					BasicdataTrayEntity basicdataTray = basicdataTrayClient.findByTrayName(warehousingDetail.getTrayName());
-
 					List<NoDataStockListDTO> noDataStockListDTOS = new ArrayList<>();
 					NoDataStockListDTO noDataStockListDTO = new NoDataStockListDTO();
 					noDataStockListDTO.setMarketId(entity.getMarketId());