1.库内作业逻辑修改

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

@@ -316,6 +316,11 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 			log.warn("#################upShelfScanAllocation: 货区信息不存在 goodsAreaId={}",goodsAreaId);
 			throw new CustomerException(403,"货区信息不存在");
 		}
+		String areaType = basicdataGoodsAreaEntity.getAreaType();
+		if("1".equals(areaType)){
+			log.warn("#################upShelfScanAllocation: 备货区不能上下架 goodsAreaId={}",goodsAreaId);
+			throw new CustomerException(403,"备货区不能上下架");
+		}
 		Long wid = basicdataGoodsAreaEntity.getWarehouseId();
 		String goodsAreaName = basicdataGoodsAreaEntity.getHeadline();//货区名称
 		BasicdataWarehouseEntity basicdataWarehouseEntity = basicdataWarehouseClient.getEntityWarehouseId(wid);
@@ -1615,6 +1620,12 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 			log.warn("#################moveAllocationScanAllocation: 货区信息不存在 goodsAreaId={}",goodsAreaId);
 			throw new CustomerException(403,"货区信息不存在");
 		}
+		String areaType = basicdataGoodsAreaEntity.getAreaType();
+		if("1".equals(areaType)){
+			log.warn("#################moveAllocationScanAllocation: 备货区不能上下架 goodsAreaId={}",goodsAreaId);
+			throw new CustomerException(403,"备货区不能上下架");
+		}
+
 		Long wid = basicdataGoodsAreaEntity.getWarehouseId();
 		String goodsAreaName = basicdataGoodsAreaEntity.getHeadline();//货区名称
 		BasicdataWarehouseEntity basicdataWarehouseEntity = basicdataWarehouseClient.getEntityWarehouseId(wid);

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

@@ -452,7 +452,7 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl<WarehouseWaybil
 		Date date = new Date();
 		warehouseWaybill.setCreateTime(date);
 		warehouseWaybill.setUpdateTime(date);
-		warehouseWaybillMapper.insert(warehouseWaybill);
+		save(warehouseWaybill);
 		return warehouseWaybill;
 
 	}