库存品备货调整、备货清单导出

blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java

@@ -8,7 +8,7 @@ public interface ModuleNameConstant {
 	/**
 	 * 如果不需要 ""
 	 */
-	public static final String DEVAUTH ="";
+	public static final String DEVAUTH ="-tjj";
 
 	/**
 	 * 工厂对接服务名称

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

@@ -20,6 +20,7 @@ package com.logpm.warehouse.feign;
 import com.logpm.warehouse.entity.WarehouseTrayGoodsEntity;
 import org.springblade.common.constant.ModuleNameConstant;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -82,4 +83,7 @@ public interface IWarehouseTrayGoodsClient {
 	@PostMapping(GETTRAYLIST)
 	List<WarehouseTrayGoodsEntity> getTrayList(@RequestBody WarehouseTrayGoodsEntity warehouseTrayGoodsEntity);
 
+
+	@GetMapping(GETTRAYLIST+"/getTrayNameByOrderPackageCode")
+    String getTrayNameByOrderPackageCode(@RequestParam String orderCode,@RequestParam Integer type);
 }

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

@@ -85,4 +85,12 @@ public interface IWarehouseUpdownGoodsClient {
 
 	@PostMapping(LOCATIONSTOCKLISTINFORMATION)
 	List<WarehouseUpdownGoodsEntity> getLocationStockListInformation(@RequestBody WarehouseUpdownGoodsEntity warehouseUpdownGoodsEntity);
+
+	/**
+	 * 查询包件库位信息
+	 * @param orderPackageCode
+	 * @return
+	 */
+	@GetMapping(LOCATIONSTOCKLISTINFORMATION+"/getAllocationNameByOrderPackageCode")
+    String getAllocationNameByOrderPackageCode(@RequestParam String orderPackageCode,@RequestParam Integer type);
 }

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

@@ -24,6 +24,7 @@ import com.logpm.distribution.entity.DistributionStockupEntity;
 import com.logpm.distribution.excel.DistributionCityExcel;
 import com.logpm.distribution.excel.DistributionMarketExcel;
 import com.logpm.distribution.excel.DistributionSelfExcel;
+import com.logpm.distribution.excel.DistributionStockupPackageListDetailExcel;
 import com.logpm.distribution.service.IDistributionStockupService;
 import com.logpm.distribution.service.IDistrilbutionBillLadingService;
 import com.logpm.distribution.vo.DistributionStockupVO;
@@ -197,6 +198,22 @@ public class DistributionStockupController extends BladeController {
 		}
 	}
 
+	@GetMapping("/export-StockUpDetail")
+	@ApiOperationSupport(order = 9)
+	@ApiOperation(value = "导出备货数据", notes = "传入paramMap")
+	public void exportStockUpDetail(@ApiIgnore @RequestParam String stockUpIds, HttpServletResponse response) {
+		if (Func.isEmpty(stockUpIds)){
+			log.info("缺少备货任务ID:{}",stockUpIds);
+			return;
+		}
+		List<Long> list = Func.toLongList(stockUpIds);
+		//查询计划包件的EXCEL列表数据
+		List<DistributionStockupPackageListDetailExcel> listExcel = distributionStockupService.exportStockUptDetail(list);
+		ExcelUtil.export(response, "自提备货数据" + DateUtil.time(), "自提备货数据表", listExcel, DistributionStockupPackageListDetailExcel.class);
+
+
+	}
+
 	/**
 	 * 备货信息表 查询备货人员信息
 	 */

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionStockupPackageListDetailExcel.java

@@ -0,0 +1,71 @@
+package com.logpm.distribution.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import lombok.Data;
+
+@Data
+@HeadRowHeight(20)
+@ContentRowHeight(18)
+public class DistributionStockupPackageListDetailExcel {
+
+
+	/**
+	 * 订单自编号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("备货单号")
+	private String stockupCode;
+
+	/**
+	 * 客户
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("客户")
+	private String consignee;
+
+	/**
+	 * 订单自编号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("品牌")
+	private String brand;
+
+	/**
+	 * 订单自编号
+	 */
+	@ColumnWidth(50)
+	@ExcelProperty("订单自编号")
+	private String orderCode;
+
+	@ColumnWidth(20)
+	@ExcelProperty("产品名称")
+	private String productName;
+
+	@ColumnWidth(20)
+	@ExcelProperty("备注")
+	private String remarks;
+
+	@ColumnWidth(20)
+	@ExcelProperty("计划件数")
+	private Integer reservationNum;
+
+
+	private String isZero;
+	/**
+	 * 包件码
+	 */
+	private String orderPackageCode;
+
+	@ColumnWidth(20)
+	@ExcelProperty("是否零担")
+	private String trayNames;
+
+	@ColumnWidth(20)
+	@ExcelProperty("是否零担")
+	private String allocationNames;
+
+
+}

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

@@ -24,6 +24,7 @@ import com.logpm.distribution.entity.DistributionStockupEntity;
 import com.logpm.distribution.excel.DistributionCityExcel;
 import com.logpm.distribution.excel.DistributionMarketExcel;
 import com.logpm.distribution.excel.DistributionSelfExcel;
+import com.logpm.distribution.excel.DistributionStockupPackageListDetailExcel;
 import com.logpm.distribution.vo.*;
 import com.logpm.distribution.vo.app.StockupZeroVO;
 import org.apache.ibatis.annotations.Mapper;
@@ -234,4 +235,18 @@ public interface DistributionStockupMapper extends BaseMapper<DistributionStocku
 	List<DistributionCityExcel> exportCity(@Param("paramMap") Map<String, Object> paramMap, @Param("idArr") List<String> idArr);
 
 	List<DistributionSelfExcel> exportSelf(@Param("paramMap") Map<String, Object> paramMap, @Param("idArr") List<String> idArr);
+
+	/**
+	 * 查询备货任务的订单详情
+	 * @param list
+	 * @return
+	 */
+	List<DistributionStockupPackageListDetailExcel> exportStockUptOrderDetail(@Param("ids") List<Long> ids);
+
+	/**
+	 * 导出备货库存品明细
+	 * @param list
+	 * @return
+	 */
+	List<DistributionStockupPackageListDetailExcel> exportStockUptInventoryDetail(@Param("ids")List<Long> list);
 }

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

@@ -33,6 +33,7 @@
         <result column="fix_time" property="fixTime"/>
         <result column="assign_time" property="assignTime"/>
     </resultMap>
+
     <delete id="deleteStockUpById">
         DELETE
         FROM logpm_distribution_stockup
@@ -1155,5 +1156,37 @@
         </where>
         GROUP BY lds.id;
     </select>
+    <select id="exportStockUptOrderDetail"
+            resultType="com.logpm.distribution.excel.DistributionStockupPackageListDetailExcel">
+        SELECT
+        lds.stockup_code stockupCode,
+        ldr.consignee consignee,
+        ldsa.brand brand,
+        ldsa.order_code orderCode,
+        ldrs.reservation_num reservationNum,
+        lds.remarks remarks,
+        ldrs.is_zero isZero,
+
+        GROUP_CONCAT(DISTINCT ldpl.material_name) AS productName,
+        GROUP_CONCAT(DISTINCT ldpl.order_package_code) AS orderPackageCode
+        FROM
+        logpm_distribution_stockup AS lds
+        LEFT JOIN logpm_distribution_stockup_info AS ldsi ON lds.id = ldsi.stockup_id
+        LEFT JOIN logpm_distribution_reservation AS ldr ON ldsi.reservation_id = ldr.id
+        LEFT JOIN logpm_distribution_reservation_stockarticle AS ldrs ON ldrs.reservation_id = ldr.id
+        LEFT JOIN logpm_distribution_stock_article AS ldsa ON ldrs.stock_article_id = ldsa.id
+        LEFT JOIN logpm_distribution_reservation_package AS ldrp ON ldrp.stock_article_id = ldrs.stock_article_id AND ldrp.reservation_id = ldr.id
+        LEFT JOIN logpm_distribution_parcel_list AS ldpl ON ldrp.parce_list_id = ldpl.id
+        WHERE
+        lds.id IN
+        <foreach collection="ids" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+        GROUP BY ldrs.id
+    </select>
+    <select id="exportStockUptInventoryDetail"
+            resultType="com.logpm.distribution.excel.DistributionStockupPackageListDetailExcel">
+
+    </select>
 
 </mapper>

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockupService.java

@@ -25,6 +25,7 @@ import com.logpm.distribution.entity.DistributionStockupEntity;
 import com.logpm.distribution.excel.DistributionCityExcel;
 import com.logpm.distribution.excel.DistributionMarketExcel;
 import com.logpm.distribution.excel.DistributionSelfExcel;
+import com.logpm.distribution.excel.DistributionStockupPackageListDetailExcel;
 import com.logpm.distribution.vo.*;
 import org.springblade.core.mp.base.BaseService;
 import org.springblade.core.tool.api.R;
@@ -274,4 +275,11 @@ public interface IDistributionStockupService extends BaseService<DistributionSto
 	 * @param stockupDTO
 	 */
 	R handlingPackages(StockupDTO stockupDTO);
+
+	/**
+	 * 查询备货详情
+	 * @param list
+	 * @return
+	 */
+	List<DistributionStockupPackageListDetailExcel> exportStockUptDetail(List<Long> list);
 }

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

@@ -40,6 +40,7 @@ import com.logpm.distribution.entity.*;
 import com.logpm.distribution.excel.DistributionCityExcel;
 import com.logpm.distribution.excel.DistributionMarketExcel;
 import com.logpm.distribution.excel.DistributionSelfExcel;
+import com.logpm.distribution.excel.DistributionStockupPackageListDetailExcel;
 import com.logpm.distribution.mapper.*;
 import com.logpm.distribution.service.*;
 import com.logpm.distribution.vo.*;
@@ -54,6 +55,7 @@ import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.common.constant.CodeDesEnum;
 import org.springblade.common.constant.DictBizConstant;
+import org.springblade.common.constant.common.IsOrNoConstant;
 import org.springblade.common.constant.orderpackage.OrderPackageStockupStatusConstant;
 import org.springblade.common.constant.pda.PdaAudioLingoStatus;
 import org.springblade.common.constant.stocklist.StockLockingStatusConstant;
@@ -199,6 +201,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 	@Autowired
 	private DistributionStockListInfoMapper distributionStockListInfoMapper;
 
+
 	@Override
 	public IPage<DistributionStockupVO> selectDistributionStockupPage(IPage<DistributionStockupVO> page, DistributionStockupVO distributionStockup) {
 		return page.setRecords(baseMapper.selectDistributionStockupPage(page, distributionStockup));
@@ -2904,7 +2907,6 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 			log.info("#############缺少库位ID:{}",stockupDTO.getAllocationId());
 			return null;
 		}
-
 		//根据物料查询出多个库存品信息
 		List<DistributionStockListEntity> distributionStockListEntities = distributionStockListMapper.selectList(Wrappers.<DistributionStockListEntity>query().lambda()
 			.eq(DistributionStockListEntity::getCargoNumber, stockupDTO.getCargoNumber())
@@ -2963,11 +2965,14 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 
 
 		List<StockConfigOrderPackageListVO> ls = new ArrayList<>();
+		//过滤出同物料库存品的ID信息
+		List<Long> stockListIds = distributionStockListEntities.stream().map(DistributionStockListEntity::getId).collect(Collectors.toList());
 		LambdaQueryWrapper<DistributionStockEntity> lambdaQueryWrapper = new LambdaQueryWrapper<>();
 		lambdaQueryWrapper.eq(DistributionStockEntity::getReservationId, stockupDTO.getReservationId());
 		lambdaQueryWrapper.eq(DistributionStockEntity::getAllocationId, stockupDTO.getAllocationId());
 		lambdaQueryWrapper.eq(DistributionStockEntity::getType, 2);
 		lambdaQueryWrapper.eq(DistributionStockEntity::getStockupId, stockupDTO.getStockupId());
+		lambdaQueryWrapper.in(DistributionStockEntity::getStockListId, stockListIds);
 		List<DistributionStockEntity> distributionStockEntities = distributionStockMapper.selectList(lambdaQueryWrapper);
 		for (DistributionStockEntity distributionStockEntity : distributionStockEntities) {
 			StockConfigOrderPackageListVO stockConfigOrderPackageListVO = new StockConfigOrderPackageListVO();
@@ -3116,4 +3121,42 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 		}
 		return R.success("成功！！");
 	}
+
+	@Override
+	public List<DistributionStockupPackageListDetailExcel> exportStockUptDetail(List<Long> list) {
+		List<DistributionStockupPackageListDetailExcel> stockupPackageListDetailExcels = baseMapper.exportStockUptOrderDetail(list);
+		if (Func.isNotEmpty(stockupPackageListDetailExcels)){
+			for (DistributionStockupPackageListDetailExcel stockupPackageListDetailExcel : stockupPackageListDetailExcels) {
+				if (stockupPackageListDetailExcel.getIsZero().equals(IsOrNoConstant.no.getValue())){
+					//订制品订单   查询托盘和库位
+					String trayName = warehouseTrayGoodsClient.getTrayNameByOrderPackageCode(stockupPackageListDetailExcel.getOrderPackageCode(),3);
+					if (Func.isNotBlank(trayName)){
+						stockupPackageListDetailExcel.setTrayNames(trayName);
+					}
+					String allocationName = warehouseUpdownGoodsClient.getAllocationNameByOrderPackageCode(stockupPackageListDetailExcel.getOrderPackageCode(),3);
+					if (Func.isNotBlank(allocationName)){
+						stockupPackageListDetailExcel.setAllocationNames(allocationName);
+					}
+				}else {
+					//零担
+					String trayName = warehouseTrayGoodsClient.getTrayNameByOrderPackageCode(stockupPackageListDetailExcel.getOrderCode(),1);
+					if (Func.isNotBlank(trayName)){
+						stockupPackageListDetailExcel.setTrayNames(trayName);
+					}
+					String allocationName = warehouseUpdownGoodsClient.getAllocationNameByOrderPackageCode(stockupPackageListDetailExcel.getOrderCode(),1);
+					if (Func.isNotBlank(allocationName)){
+						stockupPackageListDetailExcel.setAllocationNames(allocationName);
+					}
+				}
+			}
+		}
+
+
+		//库存品
+//		List<DistributionStockupPackageListDetailExcel> stockupInventoryListDetailExcels = baseMapper.exportStockUptInventoryDetail(list);
+
+
+
+		return stockupPackageListDetailExcels;
+	}
 }

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseTrayGoodsClient.java

@@ -78,4 +78,10 @@ public class WarehouseTrayGoodsClient implements IWarehouseTrayGoodsClient {
 				.eq(ObjectUtils.isNotNull(warehouseTrayGoodsEntity.getAssociationType()),WarehouseTrayGoodsEntity::getAssociationType ,warehouseTrayGoodsEntity.getAssociationType())
 		);
 	}
+
+	@Override
+	public String getTrayNameByOrderPackageCode(String orderCode,Integer type) {
+
+		return warehouseTrayGoodsService.getTrayNameByOrderPackageCode(orderCode,type);
+	}
 }

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseUpdownGoodsClient.java

@@ -91,4 +91,9 @@ public class WarehouseUpdownGoodsClient implements IWarehouseUpdownGoodsClient {
 			.eq(ObjectUtils.isNotNull(warehouseUpdownGoodsEntity.getWarehouseId()),WarehouseUpdownGoodsEntity::getWarehouseId,warehouseUpdownGoodsEntity.getWarehouseId())
 		);
 	}
+
+	@Override
+	public String getAllocationNameByOrderPackageCode(String orderPackageCode,Integer type) {
+		return warehouseUpdownGoodsService.getAllocationNameByOrderPackageCode(orderPackageCode,type);
+	}
 }

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

@@ -59,4 +59,11 @@ public interface WarehouseTrayGoodsMapper extends BaseMapper<WarehouseTrayGoodsE
     Integer SumByTrayId(@Param("id") Long trayId);
 
     void updeteWarehouseIdByTrayTypeId(@Param("trayTypeId") Long trayTypeId, @Param("warehouseId") Long warehouseId);
+
+	/**
+	 * 查询订单包件所在托盘，拼接
+	 * @param orderCode
+	 * @return
+	 */
+    String getTrayNameByOrderPackageCode(@Param("orderCode") String[] split,@Param("type")Integer type);
 }

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

@@ -318,6 +318,19 @@
     <select id="SumByTrayId" resultType="java.lang.Integer">
         SELECT sum(lwtg.num)  FROM logpm_warehouse_tray_goods lwtg where  lwtg.is_deleted =0 and lwtg.tray_id = #{id}   GROUP BY lwtg.tray_id
     </select>
+    <select id="getTrayNameByOrderPackageCode" resultType="java.lang.String">
+        SELECT
+        GROUP_CONCAT(lwt.pallet_name)
+        FROM
+        logpm_warehouse_tray_goods AS lwtg
+        LEFT JOIN logpm_warehouse_tray AS lwt ON lwtg.tray_id = lwt.id
+        WHERE
+        association_type = #{type} and association_value in
+        <foreach collection="orderCode" item="code" separator="," open="(" close=")">
+            #{code}
+        </foreach>
+        GROUP BY lwt.id
+    </select>
 
     <update id="updeteWarehouseIdByTrayTypeId">
         update logpm_warehouse_tray_goods

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

@@ -103,6 +103,13 @@ public interface WarehouseUpdownGoodsMapper extends BaseMapper<WarehouseUpdownGo
 
 	List<QuestDetailEntity> allocationDetailByStock(@Param("param") TaskSearchDTO taskSearchDTO);
 
+	/**
+	 * 查询保健库位信息。拼接
+	 * @param orderPackageCode
+	 * @return
+	 */
+    String getAllocationNameByOrderPackageCode(@Param("orderPackageCode") String[] orderPackageCode,@Param("type") Integer type);
+
 
 //	/**
 //	 * 根据货位查询货物

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

@@ -396,6 +396,22 @@
             </foreach>
         </if>
     </select>
+    <select id="getAllocationNameByOrderPackageCode" resultType="java.lang.String">
+        SELECT
+        GROUP_CONCAT( DISTINCT CONCAT_WS('-',lwgaa.headline,lwgs.goods_shelf_name,lwga.goods_allocation_name) )
+        FROM
+        logpm_warehouse_updown_goods AS lwup
+        LEFT JOIN logpm_warehouse_goods_allocation AS lwga ON lwup.allocation_id = lwga.id
+        LEFT JOIN logpm_warehouse_goods_shelf AS lwgs ON lwga.goods_shelf_id = lwgs.id
+        LEFT JOIN logpm_warehouse_goods_area AS lwgaa ON lwga.goods_area_id = lwgaa.id
+        WHERE
+        lwup.association_type = #{type} and lwup.association_value in
+        <foreach collection="orderPackageCode" item="code" close=")" open="(" separator=",">
+            #{code}
+        </foreach>
+        GROUP BY
+        lwga.id
+    </select>
 
 
 </mapper>

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

@@ -85,4 +85,11 @@ public interface IWarehouseTrayGoodsService extends BaseService<WarehouseTrayGoo
 	Integer getNumByZation(Long id);
 
     void updeteWarehouseIdByTrayTypeId(Long trayTypeId, Long warehouseId);
+
+	/**
+	 * 查询订单包件所在托盘
+	 * @param orderCode
+	 * @return
+	 */
+    String getTrayNameByOrderPackageCode(String orderCode,Integer type);
 }

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

@@ -130,4 +130,11 @@ public interface IWarehouseUpdownGoodsService extends BaseService<WarehouseUpdow
 	Integer selectCountNumByshelf(Long goodsAreaId, Long goodsShelfId);
 
 	List<WarehouseUpdownGoodsVO> findUpdownStockByMaterialCode(String materialCode, Long marketId, Long warehouseId);
+
+	/**
+	 *
+	 * @param orderPackageCode
+	 * @return
+	 */
+    String getAllocationNameByOrderPackageCode(String orderPackageCode,Integer type);
 }

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

@@ -15,6 +15,7 @@ import lombok.AllArgsConstructor;
 import lombok.extern.log4j.Log4j2;
 import org.springblade.common.constant.TenantNum;
 import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.core.tool.utils.Func;
 import org.springframework.stereotype.Service;
 
 import java.util.Date;
@@ -280,6 +281,12 @@ public class WarehouseTrayGoodsServiceImpl extends BaseServiceImpl<WarehouseTray
 		baseMapper.updeteWarehouseIdByTrayTypeId(trayTypeId,warehouseId);
 	}
 
+	@Override
+	public String getTrayNameByOrderPackageCode(String orderCode,Integer type) {
+		String[] split = Func.split(orderCode, ",");
+		return baseMapper.getTrayNameByOrderPackageCode(split,type);
+	}
+
 	@Override
 	public Boolean deleteByMasterId(Long masterId) {
 		int delete = baseMapper.delete(new QueryWrapper<WarehouseTrayGoodsEntity>().lambda()

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

@@ -33,6 +33,7 @@ import com.logpm.warehouse.vo.WarehouseUpdownGoodsVO;
 import lombok.AllArgsConstructor;
 import lombok.extern.log4j.Log4j2;
 import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.core.tool.utils.Func;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
@@ -229,4 +230,10 @@ public class WarehouseUpdownGoodsServiceImpl extends BaseServiceImpl<WarehouseUp
 		return baseMapper.findUpdownStockByMaterialCode(materialCode,marketId,warehouseId);
 	}
 
+	@Override
+	public String getAllocationNameByOrderPackageCode(String orderPackageCode,Integer type) {
+		String[] split = Func.split(orderPackageCode, ",");
+		return baseMapper.getAllocationNameByOrderPackageCode(split,type);
+	}
+
 }