1.库内作业，bug修复

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

@@ -96,7 +96,7 @@ public interface DistributionParcelListMapper extends BaseMapper<DistributionPar
 
 	List<PackageStockupVO> selectOrderInfoAllocationList(@Param("param") StockupDTO stockupDTO);
 
-    List<DistributionParcelListEntity> findALLNoUpShelfPackageByOrderCode(@Param("orderCode") String orderCode,@Param("orderCode") Long warehouseId);
+    List<DistributionParcelListEntity> findALLNoUpShelfPackageByOrderCode(@Param("orderCode") String orderCode,@Param("warehouseId") Long warehouseId);
 
     IPage<DistributionParcelListEntity> pageOweList(IPage<Object> page,@Param("param") DistributionParcelListDTO parcelListEntity);
 

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

@@ -1881,23 +1881,29 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 		targetUpdownTypeEntity.setShelfTitle(goodsShelfEntity.getGoodsShelfName());
 		targetUpdownTypeEntity.setAllocationId(allocationId);
 		targetUpdownTypeEntity.setAllocationTitle(goodsAllocationEntity.getGoodsAllocationName());
+		targetUpdownTypeEntity.setPositionCode(goodsAreaEntity.getHeadline()+"-"+goodsShelfEntity.getGoodsShelfName()+"-"+goodsAllocationEntity.getGoodsAllocationName());
 		save(targetUpdownTypeEntity);
 
-		for(WarehouseUpdownGoodsEntity updownGoodsEntity:list){
+		List<WarehouseUpdownGoodsEntity> newList = new ArrayList<>();
-
-			updownGoodsEntity.setAreaId(goodsAreaId);
-			updownGoodsEntity.setAreaTitle(goodsAreaEntity.getHeadline());
-			updownGoodsEntity.setShelfId(goodsShelfId);
-			updownGoodsEntity.setShelfTitle(goodsShelfEntity.getGoodsShelfName());
-			updownGoodsEntity.setAllocationId(allocationId);
-			updownGoodsEntity.setAllocationTitle(goodsAllocationEntity.getGoodsAllocationName());
-			updownGoodsEntity.setPositionCode(goodsAreaEntity.getHeadline()+"-"+goodsShelfEntity.getGoodsShelfName()+"-"+goodsAllocationEntity.getGoodsAllocationName());
 
+		for(WarehouseUpdownGoodsEntity updownGoodsEntity:list){
+			WarehouseUpdownGoodsEntity newUpdownGoods = new WarehouseUpdownGoodsEntity();
+			BeanUtil.copy(updownGoodsEntity,newUpdownGoods);
+			newUpdownGoods.setId(null);
+			newUpdownGoods.setUpdownTypeId(targetUpdownTypeEntity.getId());
+			newUpdownGoods.setAreaId(goodsAreaId);
+			newUpdownGoods.setAreaTitle(goodsAreaEntity.getHeadline());
+			newUpdownGoods.setShelfId(goodsShelfId);
+			newUpdownGoods.setShelfTitle(goodsShelfEntity.getGoodsShelfName());
+			newUpdownGoods.setAllocationId(allocationId);
+			newUpdownGoods.setAllocationTitle(goodsAllocationEntity.getGoodsAllocationName());
+			newUpdownGoods.setPositionCode(goodsAreaEntity.getHeadline()+"-"+goodsShelfEntity.getGoodsShelfName()+"-"+goodsAllocationEntity.getGoodsAllocationName());
+			newList.add(newUpdownGoods);
 		}
 		//货物重新绑定
-		warehouseUpdownGoodsService.saveOrUpdateBatch(list);
+		warehouseUpdownGoodsService.saveOrUpdateBatch(newList);
 
-		saveUpdownGoodsLog(list,"1",0,"移库:整库移库",targetUpdownTypeEntity.getWarehouseId());
+		saveUpdownGoodsLog(newList,"1",0,"移库:整库移库上架",targetUpdownTypeEntity.getWarehouseId());
 	}